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

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

@@ -46,7 +46,6 @@ public class AdamRedisConst {
 
     public static final String SWITCH = ADAM.concat("switch:");
     public static final String SWITCH_BUY_MEMBER = SWITCH.concat("buy:member");
-    public static final String SWITCH_GRAY_LOGIN_SMS = SWITCH.concat("gray:login:sms");
 
     /* ----------------------------------------------------------------- */
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java

@@ -49,15 +49,4 @@ public class AdamSwitchAdminController {
         redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, opt);
         return ResponseDto.success(redisUtil.get(AdamRedisConst.INCR_MEMBER_NO));
     }
-
-    @RequiresPermissions("adam:switch:gray:login")
-    @ApiOperation(value = "开放/限制校验证码")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "0-限制｜1-开放", example = "0"),
-    })
-    @PostMapping("gray/login")
-    public ResponseDto<Object> loginSmsSwitch(@Max(1) @Min(0) @RequestParam int opt) {
-        redisUtil.set(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 0 == opt ? 612543 : 615243);
-        return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
-    }
 }

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

@@ -317,10 +317,14 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
             );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+
+            return ResponseDto.success();
         } catch (Exception e) {
             log.error("购买会员支付回调处理异常[CallbackParam={}]", JsonUtils.toJson(parameter), e);
 
             handlerResultFailed = true;
+
+            return ResponseDto.failure(ErrorMapping.get("10505"));
         } finally {
             if (handlerResultFailed) {
                 adamRdmService.rmvMemberOrderVoByUid(
@@ -339,8 +343,6 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 }
             }
         }
-
-        return ResponseDto.success();
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -72,6 +72,7 @@
 10502=会员订单回调处理失败，该订单已处理
 10503=会员订单回调处理失败，订单金额有误
 10504=会员订单回调处理失败，会员价格信息不存在
+10505=会员订单回调处理异常