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

hai-cweb/src/main/java/com/cweb/controller/group/GroupController.java

@@ -2,6 +2,9 @@ package com.cweb.controller.group;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.hai.common.exception.ErrorCode;
+import com.hai.common.exception.ErrorHelp;
+import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
@@ -113,6 +116,9 @@ public class GroupController {
 
             HighGroupCode highGroupCode = groupCodeService.findGroupCode(map);
 
+            if (highGroupCode == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到相关内容");
+            }
 
             JSONObject object = groupService.getGroupContent(highGroupCode.getGroupId());
 

hai-service/src/main/java/com/hai/config/ScPetroConfig.java

@@ -53,7 +53,7 @@ public class ScPetroConfig {
         //签名放到参数中
         req.put("sign", sign);
         // 请求接口
-        return HttpsUtils.doPost(reqUrl + "syn-coupon-rule/v1", req);
+        return HttpsUtils.doPost(reqUrl + "syn-coupon-rule/v1", req , new HashMap<>());
     }
 
     /**

hai-service/src/main/resources/dev/commonConfig.properties

@@ -146,7 +146,7 @@ diandianwAppSecret=msk48q5jinmpsfdgpcyryx6lhkoiii4s
 
 groupCode = https://gratia-pay.dctpay.com/cweb?accountId=0001&key=
 
-ScPetroUrl = http://43.136.176.177:8080/hd-api/out/
+ScPetroUrl = http://43.136.176.177:8081/hd-api/out/
 ScPetroAppid = 510000313181602615
 ScPetroAppKey = 510000kA5kxtaDnx3V6HE
 ScPetroAesKey = AptFsUgpgAij3evH7rm4ubTKu5viSx9U