From db7cf1767c5ae921ee0888d9cdebb7145a20336f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 7 Mar 2025 18:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/order/entity/ShopOrderStatistic.java  | 36 +++++++++----------
 .../impl/UserAuthorizationServiceImpl.java    |  3 ++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
index 7ca2c049b..a8ca0cd8b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
@@ -36,84 +36,84 @@ public class ShopOrderStatistic implements Serializable {
     /**
      * 销售额
      */
-    private BigDecimal saleAmount;
+    private BigDecimal saleAmount = BigDecimal.ZERO;
 
     /**
      * 销售数量
      */
-    private Long saleCount;
+    private Long saleCount = 0L;
 
     /**
      * 优惠金额
      */
-    private BigDecimal discountAmount;
+    private BigDecimal discountAmount = BigDecimal.ZERO;
 
     /**
      * 优惠笔数
      */
-    private Long discountCount;
+    private Long discountCount = 0L;
 
     /**
      * 退款金额
      */
-    private BigDecimal refundAmount;
+    private BigDecimal refundAmount = BigDecimal.ZERO;
 
     /**
      * 退款笔数
      */
-    private Long refundCount;
+    private Long refundCount = 0L;
 
     /**
      * 微信支付笔数
      */
-    private Long wechatPayCount;
+    private Long wechatPayCount = 0L;
 
     /**
      * 位置支付金额
      */
-    private BigDecimal wechatPayAmount;
+    private BigDecimal wechatPayAmount = BigDecimal.ZERO;
 
     /**
      * 支付宝支付笔数
      */
-    private Long aliPayCount;
+    private Long aliPayCount = 0L;
 
     /**
      * 支付宝支付金额
      */
-    private BigDecimal aliPayAmount;
+    private BigDecimal aliPayAmount = BigDecimal.ZERO;
 
     /**
      * 挂账支付笔数
      */
-    private Long creditPayCount;
+    private Long creditPayCount = 0L;
 
     /**
      * 挂账支付金额
      */
-    private BigDecimal creditPayAmount;
+    private BigDecimal creditPayAmount = BigDecimal.ZERO;
 
     /**
      * 会员支付笔数
      */
-    private Long memberPayCount;
+    private Long memberPayCount = 0L;
 
     /**
      * 会员支付金额
      */
-    private BigDecimal memberPayAmount;
+    private BigDecimal memberPayAmount = BigDecimal.ZERO;
 
     /**
      * 主扫支付笔数
      */
-    private Long scanPayCount;
+    private Long scanPayCount = 0L;
 
     /**
      * 主扫支付金额
      */
-    private BigDecimal scanPayAmount;
-    private Long cashPayCount;
-    private BigDecimal cashPayAmount;
+    private BigDecimal scanPayAmount = BigDecimal.ZERO;
+    private Long cashPayCount = 0L;
+    private BigDecimal cashPayAmount = BigDecimal.ZERO;
 
     /**
      * 店铺id
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java
index 20af2f8a7..64c5ea6f2 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java
@@ -16,6 +16,7 @@ import com.czg.sa.MyStpLogic;
 import com.czg.sa.StpKit;
 import com.czg.service.account.util.AlipayUtil;
 import com.czg.service.account.util.WechatAuthUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.C;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +26,7 @@ import javax.annotation.Resource;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class UserAuthorizationServiceImpl implements UserAuthorizationService {
     @Resource
     private WechatAuthUtil wechatAuthUtil;
@@ -35,6 +37,7 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService {
 
     @Override
     public String getOpenId(String code, String source) {
+        log.info(code);
         String openId;
         if (UserAuthSourceEnum.WECHAT.getValue().equals(source)) {
             openId = wechatAuthUtil.getSessionKeyOrOpenId(code, true);