Parcourir la source

Merge branch 'release_toaliyun_real_2022_init' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_init

release_toaliyun_real
winter il y a 4 ans
Parent
révision
2781f9df40
1 fichiers modifiés avec 22 ajouts et 21 suppressions
  1. +22
    -21
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java

+ 22
- 21
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Voir le fichier

@@ -303,28 +303,29 @@ public class WxOrderController extends BaseController {
border.setId(id);
border.setCUserId(memberId);
WxBatchOrder wxBatchOrder = wxOrderService.batchOrderDetail(border);
if(wxBatchOrder != null){
Date now = new Date();
for (WxOrderCouponVo ocvo:wxBatchOrder.getOrders()) {
if (ocvo.getValidStartDate() != null && ocvo.getValidEndDate() != null
&& !ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) {
if (ocvo.getValidStartDate().getTime() > now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode());
} else if (ocvo.getValidEndDate().getTime() < now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode());
} else {
ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
if(wxBatchOrder == null){
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND);
}
Date now = new Date();
for (WxOrderCouponVo ocvo:wxBatchOrder.getOrders()) {
if (ocvo.getValidStartDate() != null && ocvo.getValidEndDate() != null
&& !ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) {
if (ocvo.getValidStartDate().getTime() > now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode());
} else if (ocvo.getValidEndDate().getTime() < now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode());
} else {
ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
if(ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())
&& ocvo.getPickStartDate() != null && ocvo.getPickEndDate() != null){
if (ocvo.getPickStartDate().getTime() > now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode());
} else if (ocvo.getPickEndDate().getTime() < now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode());
} else {
ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
}
if(ocvo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())
&& ocvo.getPickStartDate() != null && ocvo.getPickEndDate() != null){
if (ocvo.getPickStartDate().getTime() > now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode());
} else if (ocvo.getPickEndDate().getTime() < now.getTime()) {
ocvo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode());
} else {
ocvo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode());
}
}
}


Chargement…
Annuler
Enregistrer