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