HL2支付修改

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -14,8 +14,6 @@ import com.thinkgem.jeesite.modules.pay.alipay.service.AlipayService;
 import com.thinkgem.jeesite.modules.pay.dao.PayApiDao;
 import com.thinkgem.jeesite.modules.pay.entity.*;
 import com.thinkgem.jeesite.modules.pay.huanqiuhuiju.service.HuanqiuhuijuService;
-import com.thinkgem.jeesite.modules.pay.juhezhong.dto.ApiQuickPayDto;
-import com.thinkgem.jeesite.modules.pay.juhezhong.dto.MerchantDto;
 import com.thinkgem.jeesite.modules.pay.juhezhong.dto.PayBackDto;
 import com.thinkgem.jeesite.modules.pay.juhezhong.dto.QuickDto;
 import com.thinkgem.jeesite.modules.pay.juhezhong.service.JuHeZhongPayIntegralService;
@@ -25,7 +23,6 @@ import com.thinkgem.jeesite.modules.pay.juhezhong.utils.MakeOrderNum;
 import com.thinkgem.jeesite.modules.pay.pinganbank.PingAnBankService;
 import com.thinkgem.jeesite.modules.pay.pinganbank.dto.PingAnBankDto;
 import com.thinkgem.jeesite.modules.sys.entity.Dict;
-import com.thinkgem.jeesite.modules.sys.service.SystemService;
 import com.thinkgem.jeesite.modules.sys.utils.DictUtils;
 import com.thinkgem.jeesite.modules.user.bean.JuHeZhongPayRequest;
 import com.thinkgem.jeesite.modules.user.bean.UserRequest;
@@ -33,16 +30,15 @@ import com.thinkgem.jeesite.modules.user.entity.*;
 import com.thinkgem.jeesite.modules.user.service.UserApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.core.annotation.Order;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 支付相关
@@ -572,6 +568,7 @@ public class PayApiService {
         userSubMchId = userService.getUserSubmchid(userSubMchId);
         UserEntity userEntity = userService.getUserInfo(request);
         UserDetailEntity userDetailEntity = userService.getUserDetailByCode(request.getSubMerchantCode());
+	    userDetailEntity.setCard ( cardEntity );
         userEntity.setUserDetail(userDetailEntity);
 
         // 2. 创建支付订单信息，并保存
@@ -580,7 +577,10 @@ public class PayApiService {
         String payCode = IdGen.randomBase62(64);
         DecimalFormat df = new DecimalFormat("######0.00");
         String amount = df.format(Double.valueOf(request.getAmount()));
-        OrderEntity orderEntity = new OrderEntity(code, request.getSubMerchantCode(), payNo, payCode,"quick", request.getPayChannel(), "1",amount , request.getSubject(), "", String.valueOf("D".equalsIgnoreCase(userDetailEntity.getCard().getCardType()) ? 5 : ("C".equalsIgnoreCase(userDetailEntity.getCard().getCardType()) ? 6 : 0)), request.getCardCode());
+	    OrderEntity orderEntity = new OrderEntity ( code , request.getSubMerchantCode ( ) , payNo , payCode , "quick" , request.getPayChannel ( ) , "1" , amount ,
+			    request.getSubject ( ) , "" ,
+			    String.valueOf ( "D".equalsIgnoreCase ( userDetailEntity.getCard ( ).getCardType ( ) ) ? 5 : ( "C".equalsIgnoreCase ( userDetailEntity.getCard ( ).getCardType ( ) ) ? 6 : 0 ) ) ,
+			    request.getCardCode ( ) );
 
         payDao.saveOrderInfo(orderEntity);
         // 3. 创建分润信息，并保存
@@ -610,7 +610,8 @@ public class PayApiService {
         dto.put("swpaccid",cardEntity.getSwpaccid());
         dto.put("notifyUrl",Global.getConfig("project.access.url")+"/api/pay/openCardCallback");
         try {
-            JSONObject jsonObject = juHeZhongPayJFenService.openCard(dto);
+	        //调用验证码
+	        JSONObject jsonObject = juHeZhongPayIntegralService.quickPayHandle ( dto );
             if("0000".equals(jsonObject.get("code"))){
                 orderEntity.setTradeNo(jsonObject.getString("trade_no"));
                 payDao.updateOrderTradeNo(orderEntity);