Authored by mali

寄存订单支付回调

@@ -26,6 +26,7 @@ import com.yohoufo.dal.order.model.StorageDeposit; @@ -26,6 +26,7 @@ import com.yohoufo.dal.order.model.StorageDeposit;
26 import com.yohoufo.dal.order.StorageDepositMapper; 26 import com.yohoufo.dal.order.StorageDepositMapper;
27 import com.yohoufo.order.convert.GoodsInfoConvertor; 27 import com.yohoufo.order.convert.GoodsInfoConvertor;
28 import com.yohoufo.order.model.response.OrderSubmitResponse; 28 import com.yohoufo.order.model.response.OrderSubmitResponse;
  29 +import com.yohoufo.order.service.DepositService;
29 import com.yohoufo.order.service.IBuyerOrderMetaService; 30 import com.yohoufo.order.service.IBuyerOrderMetaService;
30 import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator; 31 import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator;
31 import org.apache.commons.collections.CollectionUtils; 32 import org.apache.commons.collections.CollectionUtils;
@@ -63,6 +64,9 @@ public class DepositOrderService { @@ -63,6 +64,9 @@ public class DepositOrderService {
63 @Autowired 64 @Autowired
64 private OrderCodeGenerator orderCodeGenerator; 65 private OrderCodeGenerator orderCodeGenerator;
65 66
  67 + @Autowired
  68 + private DepositService depositService;
  69 +
66 /** 70 /**
67 * 根据库存货号,计算需要召回的费用 71 * 根据库存货号,计算需要召回的费用
68 * @param req 72 * @param req
@@ -75,7 +79,7 @@ public class DepositOrderService { @@ -75,7 +79,7 @@ public class DepositOrderService {
75 Integer depositEndTime = storageDeposit.getDepositEndTime(); 79 Integer depositEndTime = storageDeposit.getDepositEndTime();
76 int depositRemainDay = 45; 80 int depositRemainDay = 45;
77 if (null != depositEndTime) { 81 if (null != depositEndTime) {
78 - depositRemainDay = (depositEndTime - DateUtil.getCurrentTimeSecond()) / 24 * 60 * 60; 82 + depositRemainDay = depositService.getRemainDay(req.getUid(), req.getDepositCode());
79 } 83 }
80 84
81 Integer skup = storageDeposit.getSkup(); 85 Integer skup = storageDeposit.getSkup();