Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -779,6 +779,14 @@ public class KwoTradeOrderService {
             if (!Objects.equals(HttpStatus.SUCCESS_CODE, updateResult.getCode())) {
                 throw new BusinessException(updateResult.getMsg());
             }
+            //代客下单冻结金额
+            if (Objects.equals(source, OrderSourceEnum.SALE.getType()) && param.getTrading().startsWith("1")){
+                HttpResult freezeResult = paymentDubboService.freezeMoney(orderCheck.getProcureTopEntId(),
+                        ChannelEnum.getByTrading(param.getTrading()), orderCheck.getSupplyTopEntId(), param.getPrice(), order.getId());
+                if (!Objects.equals(HttpStatus.SUCCESS_CODE, freezeResult.getCode())) {
+                    throw new BusinessException(freezeResult.getMsg());
+                }
+            }
         }
         order.setAmount(param.getAmount()).setUnit(Objects.isNull(param.getGoodsInfo()) ? null : param.getGoodsInfo().getUnit())
                 .setPrice(param.getPrice()).setTrading(param.getTrading()).setPickupType(param.getPickupType())

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dubbo/PaymentDubboServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.dubbo;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.OrderUtils;
 import com.sckw.core.web.constant.HttpStatus;
@@ -61,6 +62,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
 
     @Override
     public HttpResult freezeMoney(Long payEntId, ChannelEnum channel, Long receiveEntId, BigDecimal money, Long tOrderId) {
+        log.info("贸易下单冻结订单，payEntId：{} channel：{} receiveEntId：{} money：{} tOrderId：{}", payEntId, channel, receiveEntId, money, tOrderId);
         if (Objects.isNull(payEntId)) {
             return HttpResult.error("支付企业不能为空");
         }
@@ -90,6 +92,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
         if (httpResult.getCode() == HttpStatus.SUCCESS_CODE) {
             kwpTradeFreezeService.save(tOrderId, orderNo);
         }
+        log.info("贸易下单冻结订单:{}", JSONObject.toJSONString(httpResult));
         return httpResult;
     }