订单支付时间为半小时

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

@@ -318,9 +318,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setBuyerAvatar(cacheUtil.getAppletUserList(distributionOrder.getBuyerId()) == null?"":cacheUtil.getAppletUsers(distributionOrder.getBuyerId()).getAvatar());
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
-                //支付截止时间，下单后2小时内
+                //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
-                Instant instant = date.toInstant().plus(Duration.ofHours(2));
+                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderVo.setPayEndTime(time);
                 distributionOrderVoList.add(distributionOrderVo);
@@ -362,9 +362,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setChannelCost(PriceUtil.convertDoubleToString(channelCost));*/
             //利润
             Double profit = distributorProfit.getProfit().doubleValue();
-            //支付截止时间，下单后2小时内
+            //支付截止时间，下单后半小时内
             Date date = distributionOrder.getCreateTime();
-            Instant instant = date.toInstant().plus(Duration.ofHours(2));
+            Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
             Date time = Date.from(instant);
             distributionOrderDetailVo.setPayEndTime(time);
 
@@ -414,9 +414,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrderVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
-                //支付截止时间，下单后2小时内
+                //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
-                Instant instant = date.toInstant().plus(Duration.ofHours(2));
+                Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderVo.setPayEndTime(time);
 
@@ -447,9 +447,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
             distributionOrderDetailVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
             distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
-            //支付截止时间，下单后2小时内
+            //支付截止时间，下单后半小时内
             Date date = distributionOrder.getCreateTime();
-            Instant instant = date.toInstant().plus(Duration.ofHours(2));
+            Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
             Date time = Date.from(instant);
             distributionOrderDetailVo.setPayEndTime(time);
             return Result.success(distributionOrderDetailVo);
@@ -464,14 +464,15 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
         if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
-            long diffInHours = diffInMillies / (60 * 60 * 1000);
-            if (diffInHours >= 2) {
-                //待支付超出两小时，订单取消
+            long diffInMinutes = diffInMillies / (60 * 1000);
+            if (diffInMinutes >= 30) {
+                //待支付超出半小时，订单取消
                 distributionOrderDao.updateState(distributionOrder.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
             }
         }
     }
 
+
     /**
      * 检查用户或者分销商的订单是否有超时未付款的
      * @param userId
@@ -485,9 +486,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         List<DistributionOrder> prePayList = distributionOrderDao.findByPage(dto);
         prePayList.forEach(distributionOrder -> {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
-            long diffInHours = diffInMillies / (60 * 60 * 1000);
-            if (diffInHours >= 2) {
-                //待支付超出两小时，订单取消
+            long diffInMinutes = diffInMillies / (60 * 1000);
+            if (diffInMinutes >= 30) {
+                //待支付超出半小时，订单取消
                 distributionOrderDao.updateState(distributionOrder.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
             }
         });