Commit a9fd4c0f authored by Smile's avatar Smile Committed by wux

会员等级配置,同等级相同顺序报错

parent c1fc2206
......@@ -191,7 +191,7 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
} else {
throw exception(SCORE_RULE_STATUS_ERROR);
}
memberUserLevelConfigMapper.updateById(memberUserLevelConfigDO);
memberUserLevelConfigMapper.updateById(upMemberLevelConfigDO);
}
private void createLog(MemberUserLevelConfigDO memberUserLevelConfigDO,Integer operateType){
MemberUserLevelLogCreateReq memberUserLevelLogcreateReq = MemberUserLevelLogCreateReq
......
......@@ -665,7 +665,7 @@ public class OrderBackPageVO {
private void getOrderDesc() {
// TODO 这里的文案国际化现在只支持两种语言,如果需要支持更多的语言,需要优化
Integer lang = Objects.nonNull(this.lang) ? this.lang : I18nMessage.getLang();
if (null != this.status && this.status.equals(OrderStatusEnum.CANCEL.getValue()) && this.userType != null) {
if (null != this.status && this.status.equals(OrderStatusEnum.CANCEL.getValue()) && this.userType != null) {
String message = this.userType == 2 ? OrderStatusMsgEnum.CANCEL.getAdminSourceName() : OrderStatusMsgEnum.CANCEL.getCustomerSourceName();
this.statusMsg = lang == 0 ? I18nMessage.getZhMessage(message) : I18nMessage.getEnMessage(message);
} else if (null != this.abnormalState && this.abnormalState > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment