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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java

@@ -22,7 +22,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
      *
      * @param param
      */
-    ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param) throws Exception;
+    ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param);
 
     /**
      * 支付回调

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/CorsConfig.java

@@ -23,6 +23,9 @@ public class CorsConfig {
         // 可以自行筛选
         corsConfiguration.addAllowedOrigin("*");
         corsConfiguration.addAllowedOrigin("http://devpartner.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testh5.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://m.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("https://devpartner.zhengzai.tv");
 
         corsConfiguration.addAllowedHeader("*");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java

@@ -73,46 +73,40 @@ public class AdamMemberOrderController {
     @ApiOperation(value = "购买会员或会员码")
     @PostMapping("buy")
     public ResponseDto<AdamMemberOrderResult> buyMemberOrCode(@Valid @RequestBody AdamMemberOrderParam param) {
-        try {
-            log.debug("member/order/buy:param:{}", JsonUtils.toJson(param));
+        log.debug("member/order/buy:param:{}", JsonUtils.toJson(param));
 
-            String currentUid = CurrentUtil.getCurrentUid();
+        String currentUid = CurrentUtil.getCurrentUid();
 
-            // TODO: 2021/6/9 判断黑名单，待定（暂不做）
+        // TODO: 2021/6/9 判断黑名单，待定（暂不做）
 
 
-
-            AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
-            if (null == realInfoVo) {
-                if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
-                    return ResponseDto.failure(ErrorMapping.get("10101"));
-                }
-                adamUserService.identity(currentUid, param.getName(), param.getIdCard());
+        AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
+        if (null == realInfoVo) {
+            if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
+                return ResponseDto.failure(ErrorMapping.get("10101"));
             }
-
-            return adamMemberOrderService.buyMemberOrMemberCode(param);
-        } catch (Exception e) {
-            log.error("购买会员或会员码异常", e);
-            return ResponseDto.failure();
+            adamUserService.identity(currentUid, param.getName(), param.getIdCard());
         }
+
+        return adamMemberOrderService.buyMemberOrMemberCode(param);
     }
 
     /**
      * 当订单支付成功后，会立即通知Server一次，若未能响应成功，之后的24小时内会多次通知
      * 通知头：
      * {
-     *     "token":"eyJpdiI6IlJuTDFpOVBFOVBReUJ6OTd5ankzVVE9PSIsInZhbHVlIjoiMzhxWW52Um1lWVNYOEJ4OVh6OEdzUT09IiwibWFjIjoiM2Q4OWNkNWVkMjJkNzY0OGVjNmE5YTA3ODUwMTI5YWFlN2U5NDgwZmE0YmVmZWE4MTE1NmY1NWZjMGI2YmNiZCJ9"
+     * "token":"eyJpdiI6IlJuTDFpOVBFOVBReUJ6OTd5ankzVVE9PSIsInZhbHVlIjoiMzhxWW52Um1lWVNYOEJ4OVh6OEdzUT09IiwibWFjIjoiM2Q4OWNkNWVkMjJkNzY0OGVjNmE5YTA3ODUwMTI5YWFlN2U5NDgwZmE0YmVmZWE4MTE1NmY1NWZjMGI2YmNiZCJ9"
      * }
      * 通知参数:
      * {
-     *     "status":"1",
-     *     "type":"MBEANS",
-     *     "code":"201807201217135B516249085EC",
-     *     "order_code":"00001TESTORDER",
-     *     "price":"0.01",
-     *     "payment_type":"APPIAP",
-     *     "payment_at":"2018-07-20 12:17:13",
-     *     "payment_id":"1032334083425793457349875"
+     * "status":"1",
+     * "type":"MBEANS",
+     * "code":"201807201217135B516249085EC",
+     * "order_code":"00001TESTORDER",
+     * "price":"0.01",
+     * "payment_type":"APPIAP",
+     * "payment_at":"2018-07-20 12:17:13",
+     * "payment_id":"1032334083425793457349875"
      * }
      * 通知说明：已支付订单status为1，code为交易支付订单号，建议保存code，type为支付种类，payment_type为支付类型，以上参数是必传。
      * 通知响应：'success'，响应成功，将不再通知客户端
@@ -126,7 +120,7 @@ public class AdamMemberOrderController {
     public String paymentNotifyCallBack() {
         log.debug("/member/callback.mapParameter:{}, token:{}", JsonUtils.toJson(ServletUtils.getRequest().getParameterMap()), ServletUtils.getRequest().getHeader("token"));
         // TODO: 2021/6/13 验签
-        
+
         AdamMemberOrderCallbackParam parameter = AdamMemberOrderCallbackParam.getNew().get(ServletUtils.getRequest());
         if (1 != parameter.getStatus() ||
                 !parameter.getType().equals("VIP") ||
@@ -151,30 +145,24 @@ public class AdamMemberOrderController {
     @ApiOperation(value = "使用兑换码")
     @PostMapping("exchange")
     public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(@Valid @RequestBody AdamMemberOrderCodeParam param) {
-        try {
-            log.debug("member/order/exchange:param:{}", JsonUtils.toJson(param));
-            String currentUid = CurrentUtil.getCurrentUid();
-            if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
-                return ResponseDto.failure(ErrorMapping.get("10200"));
-            }
-
-            // TODO: 2021/6/9 判断黑名单，待定（暂不做）
+        log.debug("member/order/exchange:param:{}", JsonUtils.toJson(param));
+        String currentUid = CurrentUtil.getCurrentUid();
+        if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
+            return ResponseDto.failure(ErrorMapping.get("10200"));
+        }
 
+        // TODO: 2021/6/9 判断黑名单，待定（暂不做）
 
 
-            AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
-            if (null == realInfoVo) {
-                if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
-                    return ResponseDto.failure(ErrorMapping.get("10101"));
-                }
-                adamUserService.identity(currentUid, param.getName(), param.getIdCard());
+        AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
+        if (null == realInfoVo) {
+            if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
+                return ResponseDto.failure(ErrorMapping.get("10101"));
             }
-
-            return adamMemberOrderService.exchangeMemberCode(param);
-        } catch (Exception e) {
-            log.error("使用兑换码异常", e);
-            return ResponseDto.failure();
+            adamUserService.identity(currentUid, param.getName(), param.getIdCard());
         }
+
+        return adamMemberOrderService.exchangeMemberCode(param);
     }
 
     @ApiOperationSupport(order = 4)