|
|
@@ -4,20 +4,17 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.sckw.core.common.enums.enums.DictTypeEnum;
|
|
|
import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
import com.sckw.core.model.enums.LogisticsOrderV1Enum;
|
|
|
import com.sckw.core.utils.DateUtils;
|
|
|
import com.sckw.core.web.constant.HttpStatus;
|
|
|
import com.sckw.core.web.response.BaseResult;
|
|
|
-import com.sckw.order.api.model.TradeOrderDto;
|
|
|
import com.sckw.order.dao.KwoTradeOrderGoodsMapper;
|
|
|
import com.sckw.order.dao.KwoTradeOrderMapper;
|
|
|
import com.sckw.order.dao.KwoTradeOrderUnitMapper;
|
|
|
import com.sckw.order.enums.TradeOrderStatusEnum;
|
|
|
import com.sckw.order.model.KwoTradeOrder;
|
|
|
-import com.sckw.order.model.KwoTradeOrderArchive;
|
|
|
import com.sckw.order.model.KwoTradeOrderGoods;
|
|
|
import com.sckw.order.model.KwoTradeOrderUnit;
|
|
|
import com.sckw.order.serivce.KwoTradeOrderArchiveService;
|
|
|
@@ -25,9 +22,7 @@ import com.sckw.payment.api.dubbo.PaymentDubboService;
|
|
|
import com.sckw.payment.api.feign.PaymentFeignService;
|
|
|
import com.sckw.payment.api.model.feign.WalletPrepaidDto;
|
|
|
import com.sckw.product.api.dubbo.GoodsInfoService;
|
|
|
-import com.sckw.product.api.model.KwpGoods;
|
|
|
import com.sckw.system.api.RemoteSystemService;
|
|
|
-import com.sckw.system.api.model.dto.res.DictProduct;
|
|
|
import com.sckw.transport.api.dubbo.TransportRemoteService;
|
|
|
import com.sckw.transport.api.model.param.OrderFinishParam;
|
|
|
import com.sckw.transport.api.model.vo.KwtLogisticsOrderVO;
|
|
|
@@ -115,7 +110,7 @@ public class TradeOrderTask {
|
|
|
log.error("物流订单结算失败 {}", e.getMessage());
|
|
|
}
|
|
|
kwoTradeOrder.setPrice(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
|
|
|
- calculatePrepaidBalance(kwoTradeOrder, unitMap);
|
|
|
+ calculatePrepaidBalance(kwoTradeOrder, unitMap, kwoTradeOrderGoods.getUnitPrice());
|
|
|
} catch (Exception ex) {
|
|
|
log.error("更新订单异常{}", ex.getMessage());
|
|
|
}
|
|
|
@@ -195,7 +190,7 @@ public class TradeOrderTask {
|
|
|
}
|
|
|
Map<String, KwoTradeOrderUnit> unitMap = orderUnits.stream().collect(Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity(), (a, b) -> a));
|
|
|
// unFreezePrepaid(kwoTradeOrder,unitMap);
|
|
|
- calculatePrepaidBalance(kwoTradeOrder, unitMap);
|
|
|
+ calculatePrepaidBalance(kwoTradeOrder, unitMap, null);
|
|
|
}
|
|
|
}
|
|
|
if (Objects.equals(one.getKey(), TradeOrderStatusEnum.ING.getCode())) {
|
