ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit fabcdc3c643bf0795fca544d3942a8d3d7197c49 1 parent 00c60909

寄存订单试算

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -72,8 +72,6 @@ public class DepositOrderService { @@ -72,8 +72,6 @@ public class DepositOrderService {
72 StorageDeposit storageDeposit = storageDepositMapper.selectByDepositCode(req.getUid(), req.getDepositCode()); 72 StorageDeposit storageDeposit = storageDepositMapper.selectByDepositCode(req.getUid(), req.getDepositCode());
73 // TODO 不存在的时候有异常 73 // TODO 不存在的时候有异常
74 74
75 - // TODO 一期都是要违约金的 storageDeposit.getDepositEndTime();  
76 -  
77 Integer depositEndTime = storageDeposit.getDepositEndTime(); 75 Integer depositEndTime = storageDeposit.getDepositEndTime();
78 int depositRemainDay = 45; 76 int depositRemainDay = 45;
79 if (null != depositEndTime) { 77 if (null != depositEndTime) {
@@ -83,12 +81,12 @@ public class DepositOrderService { @@ -83,12 +81,12 @@ public class DepositOrderService {
83 Integer skup = storageDeposit.getSkup(); 81 Integer skup = storageDeposit.getSkup();
84 Long orderCode = storageDeposit.getOrderCode(); 82 Long orderCode = storageDeposit.getOrderCode();
85 83
86 - SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup.intValue()); 84 + SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
87 GoodsInfo goodsInfo = null; 85 GoodsInfo goodsInfo = null;
88 if (null != sellerOrderGoods) { 86 if (null != sellerOrderGoods) {
89 goodsInfo = GoodsInfoConvertor.SellerOrderGoods2GoodsInfo(sellerOrderGoods); 87 goodsInfo = GoodsInfoConvertor.SellerOrderGoods2GoodsInfo(sellerOrderGoods);
90 } 88 }
91 - List<BuyerOrderGoods> buyerOrderGoodses = buyerOrderGoodsMapper.selectBySkups(Lists.newArrayList(skup.intValue())); 89 + List<BuyerOrderGoods> buyerOrderGoodses = buyerOrderGoodsMapper.selectBySkups(Lists.newArrayList(skup));
92 DepositOrderComputeResp.PriceInfo priceInfo = null; 90 DepositOrderComputeResp.PriceInfo priceInfo = null;
93 if (CollectionUtils.isNotEmpty(buyerOrderGoodses)) { 91 if (CollectionUtils.isNotEmpty(buyerOrderGoodses)) {
94 priceInfo = DepositOrderComputeResp.PriceInfo.builder().goodPrice(buyerOrderGoodses.get(0).getGoodsAmount().toPlainString()).build(); 92 priceInfo = DepositOrderComputeResp.PriceInfo.builder().goodPrice(buyerOrderGoodses.get(0).getGoodsAmount().toPlainString()).build();