1

sckw-modules/sckw-order/src/main/java/com/sckw/order/task/TradeOrderTask.java

@@ -87,20 +87,9 @@ public class TradeOrderTask {
                                 return;
                             }
                             Map<String, KwoTradeOrderUnit> unitMap = orderUnits.stream().collect(Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity(), (a, b) -> a));
-                            BigDecimal sum = new BigDecimal("0");
 
                             KwoTradeOrderGoods kwoTradeOrderGoods = kwoTradeOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrderGoods>().eq(KwoTradeOrderGoods::getDelFlag, 0).eq(KwoTradeOrderGoods::getTOrderId, kwoTradeOrder.getId()).last("limit 1"));
 
-                            //更新贸易订单状态
-//                            WalletFreeze walletFreeze = new WalletFreeze();
-//                            walletFreeze.setBuyEntId(unitMap.getOrDefault("1", new KwoTradeOrderUnit()).getEntId());
-//                            walletFreeze.setSaleEntId(unitMap.getOrDefault("2", new KwoTradeOrderUnit()).getEntId());
-//                            walletFreeze.setMoney(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
-//                            walletFreeze.setTTradeOrderId(kwoTradeOrder.getId());
-//                            walletFreeze.setOrderNo(kwoTradeOrder.getTOrderNo());
-//                            log.info("结算 {}", JSONObject.toJSONString(walletFreeze));
-//                            BaseResult<Boolean> booleanBaseResult = paymentDubboService.dealMoney(walletFreeze);
-//                            log.info("结算结果：{}", JSONObject.toJSONString(booleanBaseResult));
 
                             kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
                             kwoTradeOrderMapper.updateById(kwoTradeOrder);
@@ -109,14 +98,13 @@ public class TradeOrderTask {
                             } catch (Exception e) {
                                 log.error("物流订单结算失败 {}", e.getMessage());
                             }
-                            kwoTradeOrder.setPrice(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
                             calculatePrepaidBalance(kwoTradeOrder, unitMap, kwoTradeOrderGoods.getUnitPrice());
                         } catch (Exception ex) {
                             log.error("更新订单异常{}", ex.getMessage());
                         }
                     });
                 } else {
-                    if (logisticOrderList.stream().allMatch(d -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode()).contains(d.getStatus()))) {
+                    if (logisticOrderList.stream().allMatch(d -> Objects.equals(LogisticsOrderV1Enum.COMPLETED.getCode(), d.getStatus()))) {
                         threadPoolExecutor.execute(() -> {
                             try {
                                 List<KwoTradeOrderUnit> orderUnits = kwoTradeOrderUnitMapper.selectList(new LambdaQueryWrapper<KwoTradeOrderUnit>().eq(KwoTradeOrderUnit::getTOrderId, kwoTradeOrder.getId()).eq(KwoTradeOrderUnit::getDelFlag, 0));
@@ -134,16 +122,6 @@ public class TradeOrderTask {
                                 }
                                 KwoTradeOrderGoods kwoTradeOrderGoods = kwoTradeOrderGoodsMapper.selectOne(new LambdaQueryWrapper<KwoTradeOrderGoods>().eq(KwoTradeOrderGoods::getDelFlag, 0).eq(KwoTradeOrderGoods::getTOrderId, kwoTradeOrder.getId()).last("limit 1"));
 
-                                //更新贸易订单状态
-//                                WalletFreeze walletFreeze = new WalletFreeze();
-//                                walletFreeze.setBuyEntId(unitMap.getOrDefault("1", new KwoTradeOrderUnit()).getEntId());
-//                                walletFreeze.setSaleEntId(unitMap.getOrDefault("2", new KwoTradeOrderUnit()).getEntId());
-//                                walletFreeze.setMoney(NumberUtil.mul(sum, kwoTradeOrderGoods.getUnitPrice()));
-//                                walletFreeze.setTTradeOrderId(kwoTradeOrder.getId());
-//                                walletFreeze.setOrderNo(kwoTradeOrder.getTOrderNo());
-//                                log.info("结算 {}", JSONObject.toJSONString(walletFreeze));
-//                                BaseResult<Boolean> booleanBaseResult = paymentDubboService.dealMoney(walletFreeze);
-//                                log.info("结算结果：{}", JSONObject.toJSONString(booleanBaseResult));
 
                                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
                                 kwoTradeOrderMapper.updateById(kwoTradeOrder);
@@ -189,8 +167,6 @@ public class TradeOrderTask {
                                 return;
                             }
                             Map<String, KwoTradeOrderUnit> unitMap = orderUnits.stream().collect(Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity(), (a, b) -> a));
-//                            unFreezePrepaid(kwoTradeOrder,unitMap);
-                            calculatePrepaidBalance(kwoTradeOrder, unitMap, null);
                         }
                     }
                     if (Objects.equals(one.getKey(), TradeOrderStatusEnum.ING.getCode())) {
@@ -269,25 +245,4 @@ public class TradeOrderTask {
 
     }
 
-    private void unFreezePrepaid(KwoTradeOrder kwoTradeOrder, Map<String, KwoTradeOrderUnit> unitMap) {
-        //预付制模式
-        //1解冻运费
-        if (unitMap.keySet().size() < 2) {
-            throw new BusinessException("贸易订单企业信息缺失");
-        }
-        //钱包退回金额
-        WalletPrepaidDto unFreezePrepaidDto = new WalletPrepaidDto();
-        unFreezePrepaidDto.setOrderNo(kwoTradeOrder.getTOrderNo());
-        unFreezePrepaidDto.setProEntId(unitMap.get(String.valueOf(1)).getEntId());
-        unFreezePrepaidDto.setSupEntId(unitMap.get(String.valueOf(2)).getEntId());
-        unFreezePrepaidDto.setOrderType(4);
-        unFreezePrepaidDto.setTradeType(5);
-        unFreezePrepaidDto.setRemark("贸易订单：" + unFreezePrepaidDto.getOrderNo() + ",");
-        log.info("贸易订单号：{}，订单完结调用钱包服务解冻预付余额，参数：{}", unFreezePrepaidDto.getOrderNo(), JSON.toJSONString(unFreezePrepaidDto));
-        BaseResult<Object> unFreezeResult = paymentFeignService.updatePrepaidBalance(unFreezePrepaidDto);
-        if (unFreezeResult.getCode() != HttpStatus.SUCCESS_CODE) {
-            log.error("贸易订单号：{}，订单完结解冻失败,异常信息为：{}", unFreezePrepaidDto.getOrderNo(), unFreezeResult.getMessage());
-            throw new BusinessException("贸易订单号：" + unFreezePrepaidDto.getOrderNo() + "，订单完结解冻失败");
-        }
-    }
 }