1

hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java

@@ -475,7 +475,7 @@ public class OutRechargeOrderController {
             outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId());
 
             if (order.getRechargeType() == 1) {
-                outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue());
+                outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
             }
 
             return ResponseMsgUtil.success("支付成功");

hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java

@@ -387,7 +387,7 @@ public class UnionPayController {
                     order.setPaySerialNo(body.getString("wtorderid")); // 支付流水号
                     order.setPayRealPrice(order.getPayPrice()); // 实付金额
                     if (order.getRechargeType() == 1) {
-                        outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue());
+                        outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
                     }
                     order.setStatus(2);
                     order.setPayType(4);

hai-service/src/main/java/com/hai/service/HighTestService.java

@@ -40,6 +40,6 @@ public interface HighTestService {
     * @Param [java.lang.String]
     * @return com.alibaba.fastjson.JSONObject
     */
-    JSONObject getMobile(String phone) throws Exception;
+    JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception;
 
 }

hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java

@@ -151,7 +151,7 @@ public interface OutRechargeOrderService {
      * @Param [java.lang.String]
      * @return com.alibaba.fastjson.JSONObject
      */
-    JSONObject getMobile(String phone , Integer amount) throws Exception;
+    JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception;
 
 
 }

hai-service/src/main/java/com/hai/service/impl/HighTestServiceImpl.java

@@ -7,6 +7,7 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.pay.util.sdk.WXPayConstants;
 import com.hai.common.utils.*;
+import com.hai.config.CommonSysConst;
 import com.hai.dao.HighUserEtcMapper;
 import com.hai.entity.HighDiscountAgentCode;
 import com.hai.entity.HighUser;
@@ -137,23 +138,23 @@ public class HighTestServiceImpl implements HighTestService {
     }
 
     @Override
-    public JSONObject getMobile(String phone) throws Exception {
+    public JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception {
 
         String timestamp = String.valueOf(System.currentTimeMillis());
 
         Map<String , Object> map = new HashMap<>();
-        map.put("mobile" , "18090580471");
-        map.put("amount" , "30");
-        map.put("out_order_id" , "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
-        map.put("app_key" , "eaomqcbpdz7yjfih");
+        map.put("mobile" , phone);
+        map.put("amount" , amount);
+        map.put("out_order_id" , orderNo);
+        map.put("app_key" , CommonSysConst.getSysConfig().getCzAppKey());
         map.put("timestamp" , timestamp.substring(0,timestamp.length()-3));
         map.put("is_fast" , "1");
-        map.put("notify_url" , "https://hsgcs.dctpay.com/crest/czOrder/orderRefundNotify");
+        map.put("notify_url" , CommonSysConst.getSysConfig().getCzNotifyUrl());
 
-        String signStr = WxUtils.generateSignatureAppSecret(map, "xkf9eoq2cjh6uvzp0mtrga134lnibdw8" , WXPayConstants.SignType.MD5);
+        String signStr = WxUtils.generateSignatureAppSecret(map, CommonSysConst.getSysConfig().getTelApiSecret() , WXPayConstants.SignType.MD5);
 
         map.put("sign" , signStr);
 
-        return HttpsUtils.doPost("https://hfcs.dmjvip.com/index.php/third/mobile/createOrder" , map);
+        return HttpsUtils.doPost(CommonSysConst.getSysConfig().getCzUrl() , map);
     }
 }

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -322,7 +322,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
         if (order.getRechargeType() == 1) {
-            outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue());
+            outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
         }
         order.setStatus(2);
         order.setPayType(2);
@@ -361,14 +361,14 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    public JSONObject getMobile(String phone , Integer amount) throws Exception {
+    public JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception {
 
         String timestamp = String.valueOf(System.currentTimeMillis());
 
         Map<String , Object> map = new HashMap<>();
         map.put("mobile" , phone);
         map.put("amount" , amount);
-        map.put("out_order_id" , "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
+        map.put("out_order_id" , orderNo);
         map.put("app_key" , CommonSysConst.getSysConfig().getCzAppKey());
         map.put("timestamp" , timestamp.substring(0,timestamp.length()-3));
         map.put("is_fast" , "1");

hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java

@@ -75,7 +75,7 @@ public class RechargeOrderServiceImpl implements PayService {
                 order.setPayRealPrice(new BigDecimal(map.get("total_fee")).divide(new BigDecimal("100"))); // 实付金额
                 order.setPayTime(new Date()); // 支付时间
                 if (order.getRechargeType() == 1) {
-                    outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue());
+                    outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
                 }
                 order.setStatus(2);      // 订单状态 ： 1.待支付 2.已支付 3.已完成 4.已取消 5.已退款
                 outRechargeOrderService.updateOrder(order);