HL2验证码修改

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

@@ -14,7 +14,9 @@ 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.*;
+import com.thinkgem.jeesite.modules.pay.juhezhong.dto.JuhezhongDto;
+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;
 import com.thinkgem.jeesite.modules.pay.juhezhong.service.JuHeZhongPayJFenService;
 import com.thinkgem.jeesite.modules.pay.juhezhong.service.JuHeZhongPayService;
@@ -22,7 +24,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;
@@ -30,16 +31,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;
 
 /**
  * 支付相关
@@ -591,6 +591,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. 创建支付订单信息，并保存
@@ -631,7 +632,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);