From cfbc5aee585d29c940001dfb3974c5d19bd45dce Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Thu, 21 Jul 2022 11:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderMasterController.java   | 2 --
 .../com/ghy/order/service/impl/OrderMasterServiceImpl.java    | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 939bec47..643df426 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -36,7 +36,6 @@ import com.ghy.worker.domain.WorkerCertification;
 import com.ghy.worker.service.IWorkerCertificationService;
 import com.ghy.worker.service.WorkerService;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
-import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +54,6 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/order/master")
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OrderMasterController extends BaseController {
 
     private final String prefix = "order/master";
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
index a3b93a98..f24d9412 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
@@ -78,6 +78,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
     @Override
     public int updateOrderMaster(OrderMaster orderMaster) throws BaseAdaPayException {
         if (orderMaster.getOrderStatus().equals(OrderStatus.FINISH.code())) {
+            logger.info("订单[{}]完成，进入确认分账", orderMaster.getCode());
             confirm(orderMaster.getId());
         }
         return orderMasterMapper.updateOrderMaster(orderMaster);
@@ -137,6 +138,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
         Assert.notNull(payment, "找不到支付记录");
 
         if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) < 0) {
+            logger.info("订单[{}]支付金额<=0，不需要分账", orderMaster.getCode());
             // 支付金额<=0的话 不需要走下面的流程了
             return;
         }
@@ -192,11 +194,13 @@ public class OrderMasterServiceImpl implements OrderMasterService {
 
         JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), payment.getOrderNo(),
                 AdapayUtils.bigDecimalToString(confirmAmt), divMembers, null, null);
+        logger.info("订单[{}]分账结果: {}", orderMaster.getCode(), response.toJSONString());
         boolean status = AdapayStatusEnum.succeeded.code.equals(response.getString("status"));
         // 如果确认支付失败 这里抛出异常
         Assert.isTrue(status, response.getString("error_msg"));
 
         // 走到这里确认支付和分账都成功了 异步进入自动提现流程
+        logger.info("订单[{}]开始自动提现", orderMaster.getCode());
         autoDrawCashMembers.forEach(member -> executor.execute(() -> {
             String memberId = member.getMemberId();
             String amount = member.getAmount();