支付结束时间

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -911,9 +911,15 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
-                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
-                Date time = Date.from(instant);
-                distributionOrderVo.setPayEndTime(time);
+                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+                    Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
+                    Date time = Date.from(instant);
+                    distributionOrderVo.setPayEndTime(time);
+                } else {
+                    Instant instant = date.toInstant().plus(Duration.ofHours(24));
+                    Date time = Date.from(instant);
+                    distributionOrderVo.setPayEndTime(time);
+                }
                 //查询订单利润
                 DistributorProfit distributorProfit = distributorProfitDao.findByIdOfDistributor(distributionOrder.getDistributionOrderId(), distributionOrder.getSellerId());
                 if (distributorProfit != null) {
@@ -978,7 +984,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             Double profit = distributorProfit.getProfit().doubleValue();
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
-            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);
@@ -1046,12 +1052,17 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                         distributionOrderVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getDes());
                     }
                 }
-
-                //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
-                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
-                Date time = Date.from(instant);
-                distributionOrderVo.setPayEndTime(time);
+                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+                    Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
+                    Date time = Date.from(instant);
+                    distributionOrderVo.setPayEndTime(time);
+                } else {
+                    Instant instant = date.toInstant().plus(Duration.ofHours(24));
+                    Date time = Date.from(instant);
+                    distributionOrderVo.setPayEndTime(time);
+                }
+
 
                 distributionOrderVoList.add(distributionOrderVo);
             });
@@ -1110,11 +1121,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             }
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
-            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
+            if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);
-            } else if (type != DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+            } else {
                 Instant instant = date.toInstant().plus(Duration.ofHours(24));
                 Date time = Date.from(instant);
                 distributionOrderDetailVo.setPayEndTime(time);