Просмотр исходного кода

[积分][修改][bug1002019]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
4d63852062
4 измененных файлов: 13 добавлений и 9 удалений
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  4. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -188,7 +188,11 @@ public class WxCouponController extends BaseController {
if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){
return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR);
} }
if(wxCoupon.getValidDays()!=null && coupon.getValidDays()!=null && wxCoupon.getValidDays().intValue() <= coupon.getValidDays().intValue()){
if(wxCoupon.getInventory()!=null && wxCoupon.getInventory().intValue() <= coupon.getInventory().intValue() ){
return new ResultData(ErrorCode.COUPON_STOCK_INV_ERR);
}

if(wxCoupon.getValidDays()!=null && coupon.getValidDays()!=null && wxCoupon.getValidDays().intValue() < coupon.getValidDays().intValue()){
return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR);
} }
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -114,6 +114,7 @@ public enum ErrorCode{
COUPON_SCORE_NOT_IN_RANGE(2038, "您的成长值/等级与要求不符"), COUPON_SCORE_NOT_IN_RANGE(2038, "您的成长值/等级与要求不符"),
COUPON_STOCK_NO_EQUAL_ERR(2039, "券库存设置要保证同增同减"), COUPON_STOCK_NO_EQUAL_ERR(2039, "券库存设置要保证同增同减"),
COUPON_STOCK_ENDTIME_ERR(2043, "抱歉,有效期截止时间只能增加不能减少!"), COUPON_STOCK_ENDTIME_ERR(2043, "抱歉,有效期截止时间只能增加不能减少!"),
COUPON_STOCK_INV_ERR(20144, "抱歉,库存只能增加不能减少!"),


PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"), PUSH_LIMIT_UP_TO_1DAYLIMIT(2040, "此用户一天内发券到达疲劳度限制"),
PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"), PUSH_LIMIT_UP_TO_COUPONLIMIT(2041, "此用户发此券到达疲劳度限制"),


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -208,7 +208,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
} }
} }



WxCouponChannel wxCouponChannel = new WxCouponChannel(); WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setEndTime(endTime); wxCouponChannel.setEndTime(endTime);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());


+ 7
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -359,7 +359,7 @@ public class WxFlowServiceImpl implements WxFlowService {
dynamicContentMap.put("bustype","账单"); dynamicContentMap.put("bustype","账单");
dynamicContentMap.put("contract", businessId.toString()); dynamicContentMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
dynamicContentMap.put("bustype","有价");
dynamicContentMap.put("bustype","有价");
dynamicContentMap.put("contract",businessId.toString()); dynamicContentMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(dynamicContentMap); wxMsgRecord.setDynamicContentMap(dynamicContentMap);
@@ -438,7 +438,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
@@ -863,7 +863,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(msgReplaceMap); wxMsgRecord.setDynamicContentMap(msgReplaceMap);
@@ -885,7 +885,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
@@ -917,7 +917,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(msgReplaceMap); wxMsgRecord.setDynamicContentMap(msgReplaceMap);
@@ -939,7 +939,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
@@ -1087,7 +1087,7 @@ public class WxFlowServiceImpl implements WxFlowService {
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){ }else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("bustype","有价");
msgReplaceMap.put("contract",businessId.toString()); msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);


Загрузка…
Отмена
Сохранить