后台制单货到付款

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -584,11 +584,13 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
             else if(param.getPayType().equals("3")){
                 //货到付款
-                storeOrder.setStatus(1);
                 BigDecimal amount = param.getAmount();  //货到付款 自定义代收金额
                 if (amount != null && amount.compareTo(BigDecimal.ZERO) > 0){
+                    storeOrder.setStatus(0);
                     storeOrder.setPayMoney(amount);
                     storeOrder.setPayDelivery(storeOrder.getPayPrice().subtract(amount) );
+                } else {
+                    storeOrder.setStatus(1);
                 }
             }
             storeOrder.setOrderCreateType(param.getOrderCreateType());
@@ -682,6 +684,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             }
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String payLimitTime = format.format(calendar.getTime() );
+            redisCache.setCacheObject("orderAmount:"+storeOrder.getId(), storeOrder.getPayMoney(), 24, TimeUnit.HOURS);//物流代收自定义金额
             //删除推荐订单KEY
             String createOrderKey = param.getCreateOrderKey();
             if(StringUtils.isNotEmpty(createOrderKey)){