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

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -7,6 +7,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
@@ -109,7 +110,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                     } else {
                         BigDecimal scoreRest = userInfoData.getScoreRest();
                         if (scoreRest.compareTo(BigDecimal.valueOf(integralActivity.getActivityNum())) == -1) {
-                            return ResponseDto.failure("您的积分账户余额不足！");
+                            return ResponseDto.failure(ErrorMapping.get("90082"));
                         }
                     }
                 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -7,6 +7,7 @@ import com.liquidnet.commons.lang.util.DESUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -174,7 +175,7 @@ public class SweetWechatLoginServiceImpl {
             WxMaJscode2SessionResult sessionResult = sweetWechatService.sessionInfo(jsCode, type);
             SweetAppletUsersVo sweetAppletUsersVo = redisUtils.getSweetAppletUsersOfUnionId(sessionResult.getUnionid());
             if (null == sweetAppletUsersVo) {
-                return ResponseDto.failure("90081", "获取用户信息失败");
+                return ResponseDto.failure(ErrorMapping.get("90081"));
             }
             String purePhone = sweetAppletUsersVo.getPurePhoneNumber();
             String otp = DESUtils.DES().encrypt(purePhone + LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/errors.properties

-40001=登录信息有误
-40002=账号已在另一台设备登录
-40003=登录已过期
-# ------------------------ 4开头错误码作系统保留
-
-#APP ERROR
-20001=验证码发送失败
-20002=验证码无效
-20003=无权查看
-20004=参数错误
-20005=手机号获取失败，请更换登录方式
-20006=第三方账号未注册
-20007=数量错误
-20008=无权购买
-20009=非会员用户暂不可购买
-20010=当前不可购买
-20011=未开始售卖
-20012=售卖已结束
-20013=已超过快递票截止时间
-20014=快递票未填写收货地址
-20015=入场人数量错误
-20016=库存不足
-20017=年龄不符合
-20018=下单失败
-20019=申请失败
-20020=当前状态不可撤回
-20021=退款金额不能为0
-20022=申请金额不得小于0
-20023=请求频繁
-20024=订单不存在
-20025=订单已支付
-20026=订单已关闭
-20028=订单已失效
-20027=您已支付请刷新再试
-20029=未选择支付方式
-20030=查看失败
-
-#APP JDM
-20201=
-
-
-
-# 专业版APP
-20601=账号不存在
-20602=密码错误
-20603=
-20604=
-20605=
-20606=当前账号无关联演出数据
-20607=当前账号未关联当前演出
-20608=当前演出还未开放下载
-
-# 演出
-20700=演出详情获取失败
-20701=巡演获取失败
-20702=获取演出场次票种失败
-20703=获取支付前详情失败
+# 特殊状态码
+90081=获取用户信息失败
+90082=您的积分账户余额不足！