修改bug

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

@@ -68,7 +68,7 @@ public class PayApiService {
         for (String key : userBenefits.keySet()) {
             String benefitCode = IdGen.randomBase62(64);
             BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
-            benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())/100));
+            benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
             payDao.saveBenefitInfo(benefitEntity);
         }
         // 4. JuHeZhong支付
@@ -117,7 +117,7 @@ public class PayApiService {
         quickDto.setTrxType(3);
         quickDto.setMerchantId(ComCode.MERCHANT_ID);
         quickDto.setOrderId(orderEntity.getPayCode()); // 将订单的支付号传给第三方平台
-        quickDto.setAmount(Long.parseLong(request.getAmount()));
+        quickDto.setAmount(Long.parseLong(request.getAmount())*100);
 
         // 获取支付卡号
         CardEntity cardEntity = userService.getCardInfo(request);
@@ -136,12 +136,12 @@ public class PayApiService {
         rateEntity.setPayMethod("quick");
         rateEntity = userService.getRateByLevel(rateEntity);
         if(rateEntity!=null){
-            quickDto.setUserFee(new BigDecimal(Long.parseLong(request.getAmount())*Double.valueOf(rateEntity.getRate()))); // 手续费 单位：分 ，D0 业务必传
+            quickDto.setUserFee(new BigDecimal(Long.parseLong(request.getAmount())*100*Double.valueOf(rateEntity.getRate()))); // 手续费 单位：分 ，D0 业务必传
         }else{
             quickDto.setUserFee(new BigDecimal(0));
         }
-        quickDto.setFrontUrl(Global.getConfig("sys.pre.url")+"/api/pay/notifyPay");// 前台地址
-        quickDto.setNotifyUrl(Global.getConfig("sys.pre.url")+"/api/pay/notifyPay");// 通知url
+        quickDto.setFrontUrl(Global.getConfig("project.access.url")+"/api/pay/notifyPay");// 前台地址
+        quickDto.setNotifyUrl(Global.getConfig("project.access.url")+"/api/pay/notifyPay");// 通知url
         quickDto.setTimestamp(System.currentTimeMillis());
         quickDto.setMerchantKey(ComCode.MERCHANT_KEY);
         JSONObject jsonObject = juHeZhongPayService.quickPay(quickDto);
@@ -242,6 +242,7 @@ public class PayApiService {
     @Scheduled(cron = "*/30 * * * * ?")
     @Transactional(readOnly = false)
     public void updateOrderTiming(){
+        System.out.println("定时任务。。。。。");
         OrderEntity orderEntity = new OrderEntity();
         orderEntity.setCreated(DateUtils.getYesterday(DateUtils.getYesterday("yyyy-MM-dd HH:mm:ss")));
         List<OrderEntity> list = payDao.getOrderListTimeing(orderEntity);

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -189,8 +189,12 @@ public class UserApiService {
         String code = IdGen.randomBase62(64);
         String type = "1"; // 默认将卡片添加为对私
         String status = "0"; // 新增卡片审核状态均为未审核
-        String subMerchantId = registJuHeZhongPay(request, type);
-        CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "N", subMerchantId, request.getCardSrc().replace(Global.getConfig("sys.pre.url"), ""), type, status, request.getProvince(), request.getCity());
+        String subMerchantId = "";//registJuHeZhongPay(request, type);
+        String cardSrc = "";
+        if(request.getCardSrc()!= null){
+            cardSrc = request.getCardSrc().replace(Global.getConfig("sys.pre.url"), "");
+        }
+        CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "N", subMerchantId, cardSrc, type, status, request.getProvince(), request.getCity());
         userDao.addNewCard(cardEntity);
     }
 
@@ -217,7 +221,7 @@ public class UserApiService {
         // 为用户卡注册subMerchantId
         String type = "1"; // 默认将卡片添加为对私
         String status = "0"; // 新增卡片审核状态均为未审核
-        String subMerchantId = registJuHeZhongPay(request, type);
+        String subMerchantId = null;//registJuHeZhongPay(request, type);
         // 更新银行卡详情
         CardEntity cardStatusEntity = new CardEntity(request.getSubMerchantCode(), "N");
         userDao.updateCardStatus(cardStatusEntity);

src/main/resources/youka.properties

@@ -95,12 +95,15 @@ activiti.form.server.url=
 #sys.pre.url=http://localhost:8080/
 #sys.pre.url=http://youka-api-zhennan-test.router.default.svc.cluster.local/
 sys.pre.url=http://39.107.124.166:8080/
+
+project.access.url =  http://39.107.124.166:8080/youka-api/
 #图片文件保存地址
 #image.save.url=D:/youka/images/
 #image.save.url=/tomcat/webapps/ROOT/youka/image/
 image.save.url=/data/youka/image/
 #图片返回路径
 image.return.url=youka-api/image/
+
 #ali接口获取银行logo
 logo.bank.url=https://apimg.alipay.com/combo.png?d=cashier&t=