Преглед изворни кода

fix card

release_toaliyun_real
lin пре 3 година
родитељ
комит
c92850e5c9
2 измењених фајлова са 10 додато и 4 уклоњено
  1. +9
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 9
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java Прегледај датотеку

@@ -19,6 +19,7 @@ import com.iformall.domain.vo.WxCouponPasswordVo;
import com.iformall.enums.EnumCacheKey; import com.iformall.enums.EnumCacheKey;
import com.iformall.enums.EnumCardInfoStatus; import com.iformall.enums.EnumCardInfoStatus;
import com.iformall.enums.EnumCardInfoType; import com.iformall.enums.EnumCardInfoType;
import com.iformall.enums.EnumCouponOrderStatus;
import com.iformall.enums.EnumCouponPasswordStatus; import com.iformall.enums.EnumCouponPasswordStatus;
import com.iformall.enums.EnumCouponPasswordSupport; import com.iformall.enums.EnumCouponPasswordSupport;
import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponType;
@@ -189,10 +190,15 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {
//couponOrder //couponOrder
WxCouponOrder couponOrder = couponOrderMap.get(coo.getId()); WxCouponOrder couponOrder = couponOrderMap.get(coo.getId());
if (null != couponOrder) { if (null != couponOrder) {
//co.setCuserId();
//co.setOwnerId();
co.setExpiredTime(couponOrder.getExpiredTime()); co.setExpiredTime(couponOrder.getExpiredTime());
co.setStatus(couponOrder.getCouponOrderStatus()); co.setStatus(couponOrder.getCouponOrderStatus());
}else {
//实体卡支付无couponOrder
if (coo.getRemainingAmount() > 0 ) {
co.setStatus(EnumCouponOrderStatus.CARD_USING.getCode());
}else {
co.setStatus(EnumCouponOrderStatus.CARD_COMPLETE.getCode());
}
} }
//user //user
@@ -200,7 +206,7 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {
if (null != buyUser) { if (null != buyUser) {
co.setCnickName(buyUser.getNickName()); co.setCnickName(buyUser.getNickName());
} }
WxCUserBasicInfo owner = cUserMap.get(coo.getCUserId());
WxCUserBasicInfo owner = cUserMap.get(coo.getOwnerUserId());
if (null != owner) { if (null != owner) {
co.setOnickName(owner.getNickName()); co.setOnickName(owner.getNickName());
co.setOuPhone(owner.getPhone()); co.setOuPhone(owner.getPhone());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Прегледај датотеку

@@ -2571,7 +2571,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
record.setUpdateDate(new Date()); record.setUpdateDate(new Date());
wxCouponOrderMapper.updateById(record); wxCouponOrderMapper.updateById(record);
cardInfo.setCUserId(record.getOwnerId());
cardInfo.setOwnerUserId(record.getOwnerId());
cardInfo.setUpdateDate(new Date()); cardInfo.setUpdateDate(new Date());
wxCardInfoMapper.updateById(cardInfo); wxCardInfoMapper.updateById(cardInfo);


Loading…
Откажи
Сачувај