记得上下班打卡 | git大法好,push需谨慎

Commit bd9c13db authored by 胡佳晨's avatar 胡佳晨

库存回滚逻辑

parent 65a64a6e
......@@ -147,7 +147,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
for (CandyUserCouponBasicDto dtoItem : dtoList) {
CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
if (type == 1) {
if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || dtoItem.getState().equals(21)) {
if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
continue;
}
} else if (type == 2) {
......@@ -216,7 +216,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
for (CandyUserCouponBasicDto dtoItem : dtoList) {
CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
if (type == 1) {
if (baseVo.getState().equals(3) || dtoItem.getState().equals(5) || dtoItem.getState().equals(21)) {
if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
continue;
}
} else if (type == 2) {
......
......@@ -177,7 +177,6 @@ public class CouponBaseUtil {
voRules.setBusiId(ruleItem.getBusiId());
voRules.setBusiName(ruleItem.getBusiName());
rulesVoList.add(voRules);
System.out.println(dtoItem.getUcouponId());
switch (ruleItem.getUseScope()) {
case 80://商品
isTarget = isTargetCoupon(ruleItem.getBusiId(), dtoItem.getCouType(), goodId, priceTotal, dtoItem.getValOver());
......
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