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,7 +73,6 @@ 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));
 
         String currentUid = CurrentUtil.getCurrentUid();
@@ -81,7 +80,6 @@ public class AdamMemberOrderController {
         // TODO: 2021/6/9 判断黑名单，待定（暂不做）
 
 
-
         AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
         if (null == realInfoVo) {
             if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
@@ -91,10 +89,6 @@ public class AdamMemberOrderController {
         }
 
         return adamMemberOrderService.buyMemberOrMemberCode(param);
-        } catch (Exception e) {
-            log.error("购买会员或会员码异常", e);
-            return ResponseDto.failure();
-        }
     }
 
     /**
@@ -151,7 +145,6 @@ 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)) {// 仅限从未购买过会员的用户使用
@@ -161,7 +154,6 @@ public class AdamMemberOrderController {
         // TODO: 2021/6/9 判断黑名单，待定（暂不做）
 
 
-
         AdamRealInfoVo realInfoVo = adamRdmService.getRealInfoVoByUid(currentUid);
         if (null == realInfoVo) {
             if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
@@ -171,10 +163,6 @@ public class AdamMemberOrderController {
         }
 
         return adamMemberOrderService.exchangeMemberCode(param);
-        } catch (Exception e) {
-            log.error("使用兑换码异常", e);
-            return ResponseDto.failure();
-        }
     }
 
     @ApiOperationSupport(order = 4)