...
|
...
|
@@ -72,8 +72,6 @@ public class DepositOrderService { |
|
|
StorageDeposit storageDeposit = storageDepositMapper.selectByDepositCode(req.getUid(), req.getDepositCode());
|
|
|
// TODO 不存在的时候有异常
|
|
|
|
|
|
// TODO 一期都是要违约金的 storageDeposit.getDepositEndTime();
|
|
|
|
|
|
Integer depositEndTime = storageDeposit.getDepositEndTime();
|
|
|
int depositRemainDay = 45;
|
|
|
if (null != depositEndTime) {
|
...
|
...
|
@@ -83,12 +81,12 @@ public class DepositOrderService { |
|
|
Integer skup = storageDeposit.getSkup();
|
|
|
Long orderCode = storageDeposit.getOrderCode();
|
|
|
|
|
|
SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup.intValue());
|
|
|
SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
|
|
|
GoodsInfo goodsInfo = null;
|
|
|
if (null != sellerOrderGoods) {
|
|
|
goodsInfo = GoodsInfoConvertor.SellerOrderGoods2GoodsInfo(sellerOrderGoods);
|
|
|
}
|
|
|
List<BuyerOrderGoods> buyerOrderGoodses = buyerOrderGoodsMapper.selectBySkups(Lists.newArrayList(skup.intValue()));
|
|
|
List<BuyerOrderGoods> buyerOrderGoodses = buyerOrderGoodsMapper.selectBySkups(Lists.newArrayList(skup));
|
|
|
DepositOrderComputeResp.PriceInfo priceInfo = null;
|
|
|
if (CollectionUtils.isNotEmpty(buyerOrderGoodses)) {
|
|
|
priceInfo = DepositOrderComputeResp.PriceInfo.builder().goodPrice(buyerOrderGoodses.get(0).getGoodsAmount().toPlainString()).build();
|
...
|
...
|
|