hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
new-dev
袁野 1 year ago
parent dad6ed797d
commit 70178c7e5a
5 changed files with 16 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  2. 1
      hai-order/src/main/java/com/web/controller/notify/GroupOrderController.java
  3. 2
      hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java
  4. 10
      hai-service/src/main/resources/prod-9401/commonConfig.properties
  5. 10
      hai-service/src/main/resources/prod/commonConfig.properties

2
hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
View File

File diff suppressed because one or more lines are too long

1
hai-order/src/main/java/com/web/controller/notify/GroupOrderController.java
Unescape View File

@ -48,7 +48,6 @@ public class GroupOrderController {
try { try {
log.info("============回调任务Start============="); log.info("============回调任务Start=============");
log.info("团购订单-回调参数: " + groupCode); log.info("团购订单-回调参数: " + groupCode);

2
hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java
Unescape View File

@ -314,7 +314,7 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe
// 预发码 // 预发码
JSONObject preSendCoupon = ScPetroConfig.getCoupon(couponList.get(0).getHighCoupon().getCouponKey(), userModel.getHighUser().getPhone() , tradeId); JSONObject preSendCoupon = ScPetroConfig.getCoupon(couponList.get(0).getHighCoupon().getCouponKey(), userModel.getHighUser().getPhone() , tradeId);
if (!preSendCoupon.getString("code").equals("1")) { 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")); String data = ScPetroConfig.decrypt(preSendCoupon.getString("biz_content"));

10
hai-service/src/main/resources/prod-9401/commonConfig.properties
Unescape View File

@ -131,7 +131,11 @@ diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s
groupCode = https://pay.dctpay.com/cweb?accountId=0001&key= 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/ ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
ScPetroAppid = 510000526745391907 ScPetroAppid = 510000313181602615
ScPetroAppKey = 5100006xmbmM2NBpm5HXT ScPetroAppKey = 510000kA5kxtaDnx3V6HE
ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U

10
hai-service/src/main/resources/prod/commonConfig.properties
Unescape View File

@ -137,7 +137,11 @@ diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s
groupCode = https://pay.dctpay.com/cweb?accountId=0001&key= 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/ ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
ScPetroAppid = 510000526745391907 ScPetroAppid = 510000313181602615
ScPetroAppKey = 5100006xmbmM2NBpm5HXT ScPetroAppKey = 510000kA5kxtaDnx3V6HE
ScPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U

Write Preview
Loading…
Cancel
Save