Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

1 year ago · 70178c7e5a
parent dad6ed797d
commit 70178c7e5a
5 changed files with 16 additions and 9 deletions
--- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
--- a/hai-order/src/main/java/com/web/controller/notify/GroupOrderController.java
+++ b/hai-order/src/main/java/com/web/controller/notify/GroupOrderController.java
@ -48,7 +48,6 @@ public class GroupOrderController {
        try {


-
            log.info("============回调任务Start=============");
            log.info("团购订单-回调参数: " + groupCode);

--- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java
@ -314,7 +314,7 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe
                        // 预发码
                        JSONObject preSendCoupon = ScPetroConfig.getCoupon(couponList.get(0).getHighCoupon().getCouponKey(), userModel.getHighUser().getPhone() , tradeId);
                        if (!preSendCoupon.getString("code").equals("1")) {
-                            throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "当前优惠券不可购买");
+                            throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , "系统维护中");
                        }

                        String data = ScPetroConfig.decrypt(preSendCoupon.getString("biz_content"));
--- a/hai-service/src/main/resources/prod-9401/commonConfig.properties
+++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties
@ -131,7 +131,11 @@ diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s

 groupCode =  https://pay.dctpay.com/cweb?accountId=0001&key=

+#ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
+#ScPetroAppid = 510000526745391907
+#ScPetroAppKey = 5100006xmbmM2NBpm5HXT
+#ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
 ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
-ScPetroAppid = 510000526745391907
-ScPetroAppKey = 5100006xmbmM2NBpm5HXT
-ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
+ScPetroAppid = 510000313181602615
+ScPetroAppKey = 510000kA5kxtaDnx3V6HE
+ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U
--- a/hai-service/src/main/resources/prod/commonConfig.properties
+++ b/hai-service/src/main/resources/prod/commonConfig.properties
@ -137,7 +137,11 @@ diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s

 groupCode =  https://pay.dctpay.com/cweb?accountId=0001&key=

+#ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
+#ScPetroAppid = 510000526745391907
+#ScPetroAppKey = 5100006xmbmM2NBpm5HXT
+#ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
 ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
-ScPetroAppid = 510000526745391907
-ScPetroAppKey = 5100006xmbmM2NBpm5HXT
-ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
+ScPetroAppid = 510000313181602615
+ScPetroAppKey = 510000kA5kxtaDnx3V6HE
+ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U