Merge branch 'dev-sweet' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -123,6 +123,7 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
     private List<KylinOrderRefundEntitiesVo> orderRefundEntitiesVoList;
     private List<KylinOrderRefundPicVo> orderRefundPicVos;
     private List<String> picList;
+    private String payType;
 
     public void setStatus(Integer status){
         try {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -47,7 +47,7 @@ var table = {
                     paginationLoop: false,
                     pageSize: 10,
                     pageNumber: 1,
-                    pageList: [10, 25, 50],
+                    pageList: [10, 25, 50, 200],
                     toolbar: "toolbar",
                     loadingFontSize: 13,
                     striped: false,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/details.html

@@ -11,6 +11,8 @@
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderRefundsId}"></div>
             <label class="col-sm-2 control-label">票务订单id：</label>
             <div class="form-control-static" th:text="${KylinOrderRefundsVo.orderTicketsId}"></div>
+            <label class="col-sm-2 control-label">实际支付方式：</label>
+            <div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',KylinOrderRefundsVo.payType)}"/>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">退款编号：</label>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -250,6 +250,13 @@
                 {
                     field: 'refundError',
                     title: '退款结果备注',
+                    formatter: function (value, row, index) {
+                        if (row.status == 6) {
+                            return row.refundError;
+                        } else {
+                            return '';
+                        }
+                    },
                     cellStyle: function(value, row, index) {
                         return {css : {"color": "red","font-weight": "bold"} };
                     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
@@ -288,7 +289,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
-                res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
+                res = true;
                 break;
             case "refuse":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, "", refuse);
@@ -383,6 +385,11 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             kylinOrderRefundsVo.setPicList(strList);
         }
 
+        KylinOrderTickets kylinOrderTickets = kylinOrderTicketsMapper.selectOne(
+                Wrappers.lambdaQuery(KylinOrderTickets.class).eq(KylinOrderTickets::getOrderTicketsId, data.getOrderTicketsId())
+        );
+        kylinOrderRefundsVo.setPayType(kylinOrderTickets.getPayType());
+
         return kylinOrderRefundsVo;
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java

@@ -75,13 +75,13 @@ public class KylinRefundPerformancesAdminServiceImpl {
         if (null != orderStatisAlipay || null != orderStatisWepay) {
             if (null != orderStatisAlipay) {
                 totalPriceRefundAlipay = (BigDecimal) orderStatisAlipay.get("total_price_refund");
-                BigDecimal totalRefundNumberAlipayBigDecimal = (BigDecimal) orderStatisAlipay.get("total_refund_number");
+                Long totalRefundNumberAlipayBigDecimal = (Long) orderStatisAlipay.get("total_refund_number");
                 totalRefundNumberAlipay = totalRefundNumberAlipayBigDecimal.intValue();
             }
 
             if (null != orderStatisWepay) {
                 totalPriceRefundWepay = (BigDecimal) orderStatisWepay.get("total_price_refund");
-                BigDecimal totalRefundNumberWepayBigDecimal = (BigDecimal) orderStatisWepay.get("total_refund_number");
+                Long totalRefundNumberWepayBigDecimal = (Long) orderStatisWepay.get("total_refund_number");
                 totalRefundNumberWepay = totalRefundNumberWepayBigDecimal.intValue();
             }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -400,7 +401,8 @@ public class KylinRefundsStatusServiceImpl {
         return true;
     }
 
-    public boolean orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
+    @Async
+    public void orderTicketRefundUnfilled(List<KylinOrderRefunds> refundList, String refuse) {
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
 
@@ -499,8 +501,6 @@ public class KylinRefundsStatusServiceImpl {
         );
         dataUtils.delOrderRefundVo(orderRefundIds);
         dataUtils.delOrderRefundVoByOrderId(orderIds);
-
-        return true;
     }
 
     public boolean orderTicketRefunded(RefundCallbackParam refundCallbackParam, KylinOrderRefunds refundInfo) {

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -39,7 +39,7 @@ liquidnet:
   mongodb:
     host: 39.106.122.201:27017
     port: 27017
-    user: root
+    user: admin
     pwd: S&y$6d*JwJ
   service:
     adam:

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -39,7 +39,7 @@ liquidnet:
   mongodb:
     host: 39.106.122.201:27017
     port: 27017
-    user: root
+    user: admin
     pwd: S&y$6d*JwJ
   service:
     adam:

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon-dev.yml

@@ -14,7 +14,7 @@ liquidnet:
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level: debug
+    level: info
   mysql:
     database-name: dev_ln_scene
   mongodb:

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -56,7 +56,7 @@
 
     <select id="getPerformanceRefundOrderStatis" resultType="java.util.HashMap">
         SELECT
-        SUM(o.price_actual - o.price_refund) as total_price_refund, SUM(o.number - o.refund_number) as
+        SUM(o.price_actual - o.price_refund) as total_price_refund, COUNT(*) as
         total_refund_number
         FROM kylin_order_tickets AS o
         JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

 adam_user.add=INSERT INTO adam_user (`uid`, mobile, `state`, is_complete, created_at) VALUES (?,?,?,?,?) 
 adam_user.complete=UPDATE adam_user SET is_complete=?, updated_at=? WHERE `uid`=? 
 adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=? 
-adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,curdate()), updated_at=?, closed_at=? WHERE `uid`=? 
+adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,'_',curtime()), updated_at=?, closed_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, avatar, qr_code) VALUES (?,?,?,?) 
@@ -13,7 +13,7 @@ adam_real_name.add=INSERT INTO adam_real_name (real_name_id, `uid`, `type`, `nam
 # ----------------------------------------------------
 adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickname, platform, `state`, created_at) values (?,?,?,?,?,?,?) 
 adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? 
-adam_third_party.close=UPDATE adam_third_party SET `state`=2, open_id=concat(open_id, curdate()), updated_at=?, comment='close' WHERE `uid`=? 
+adam_third_party.close=UPDATE adam_third_party SET `state`=2, updated_at=?, comment='close' WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?) 

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -231,3 +231,192 @@ CREATE TABLE `sweet_user_relation`
   ROW_FORMAT = DYNAMIC COMMENT '用户 收藏/喜欢等状态';
 
 
+--    下面为MDSK表     --
+-- 电子宣传手册表
+drop TABLE if exists `sweet_manual_mdsk`;
+CREATE TABLE `sweet_manual_mdsk`
+(
+    `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_id`      varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_id',
+    `performance_id` varchar(200)    NULL COMMENT '演出id',
+    `status`         tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `is_release`     tinyint         NOT NULL DEFAULT 1 COMMENT '0取消 1发布',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+
+    KEY `manual_id_index` (`manual_id`),
+    KEY `performance_id_index` (`performance_id`),
+    KEY `is_release_index` (`is_release`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册表';
+
+-- 电子宣传手册显示内容表
+drop TABLE if exists `sweet_manual_sort_mdsk`;
+CREATE TABLE `sweet_manual_sort_mdsk`
+(
+    `mid`           bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_id`     varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_id',
+    `show_position` varchar(200)    NULL COMMENT '显示哪个，号隔开',
+    `created_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `manual_id_index` (`manual_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册显示内容表';
+
+-- 电子宣传手册富文本表
+drop TABLE if exists `sweet_richtext_mdsk`;
+CREATE TABLE `sweet_richtext_mdsk`
+(
+    `mid`         bigint unsigned NOT NULL AUTO_INCREMENT,
+    `richtext_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'order_refund_id',
+    `manual_id`   varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_id',
+    `details`     longtext        NULL COMMENT '富文本详情',
+    `local`       varchar(200)    NOT NULL DEFAULT '' COMMENT '经纬度 5需要',
+    `pic_url`     varchar(200)    NOT NULL DEFAULT '' COMMENT '地图图片地址 2需要',
+    `type`        tinyint         NOT NULL DEFAULT 0 COMMENT '类型 1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略',
+    `status`      tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+
+    KEY `richtext_id_index` (`richtext_id`),
+    KEY `manual_id_index` (`manual_id`),
+    KEY `type_index` (`type`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册富文本表';
+
+
+-- 电子宣传手册艺人表
+drop TABLE if exists `sweet_manual_artists_mdsk`;
+CREATE TABLE `sweet_manual_artists_mdsk`
+(
+    `mid`                bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_relation_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_relation_id',
+    `manual_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `stage_id`           varchar(200)    NULL COMMENT '关联id',
+    `artists_id`         varchar(200)    NULL COMMENT '关联id',
+    `performance_start`  datetime        NULL COMMENT '演出开始时间',
+    `performance_end`    datetime        NULL COMMENT '演出结束时间',
+    `signature_start`    datetime        NULL COMMENT '签收开始时间',
+    `signature_end`      datetime        NULL COMMENT '签收结束时间',
+    `status`             tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+
+    KEY `manual_relation_id_index` (`manual_relation_id`),
+    KEY `manual_id_index` (`manual_id`),
+    KEY `stage_id_index` (`stage_id`),
+    KEY `artists_id_index` (`artists_id`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册艺人表';
+
+
+-- 电子宣传手册通知表
+drop TABLE if exists `sweet_manual_notify_mdsk`;
+CREATE TABLE `sweet_manual_notify_mdsk`
+(
+    `mid`              bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_notify_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_notify_id',
+    `manual_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `title`            varchar(200)    NOT NULL DEFAULT '' COMMENT '标题',
+    `content`          longtext        NULL COMMENT '内容',
+    `status`           tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`       datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`       datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `manual_notify_id_index` (`manual_notify_id`),
+    KEY `manual_id_index` (`manual_id`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册通知表';
+
+
+-- 电子宣传手册商铺表
+drop TABLE if exists `sweet_manual_shop_mdsk`;
+CREATE TABLE `sweet_manual_shop_mdsk`
+(
+    `mid`                   bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_shop_id`        varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
+    `manual_id`             varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `title`                 varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
+    `pic_url`               varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
+    `describes`              longtext        NULL COMMENT '商家介绍',
+    `type`                  tinyint         NOT NULL DEFAULT 1 COMMENT '1吃喝 2玩乐',
+    `is_recommend`          tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
+    `sort`                  tinyint         NOT NULL DEFAULT 0 COMMENT '排序字段 数字越大越靠前',
+    `status`                tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `manual_shop_index` (`manual_shop_id`),
+    KEY `manual_id_index` (`manual_id`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册商铺表';
+
+-- 正在现场服务号关注事件储存用户信息表
+drop TABLE if exists `sweet_wechat_user_mdsk`;
+CREATE TABLE `sweet_wechat_user_mdsk`
+(
+    `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'user_id',
+    `openId`         varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
+    `unionId`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
+    `nickname`       varchar(200)    NOT NULL DEFAULT '' COMMENT '昵称',
+    `sexDesc`        varchar(200)    NOT NULL DEFAULT '' COMMENT '性别',
+    `sex`            tinyint         NOT NULL DEFAULT 0 COMMENT '性别 男1',
+    `headImgUrl`     varchar(200)    NOT NULL DEFAULT '' COMMENT '头像',
+    `language`       varchar(200)    NOT NULL DEFAULT '' COMMENT 'zh_CN',
+    `country`        varchar(200)    NOT NULL DEFAULT '' COMMENT '国家',
+    `province`       varchar(200)    NOT NULL DEFAULT '' COMMENT '省',
+    `city`           varchar(200)    NOT NULL DEFAULT '' COMMENT '市',
+    `subscribeTime`  datetime        NULL     DEFAULT null COMMENT '关注时间',
+    `subscribeScene` varchar(200)    NOT NULL DEFAULT '' COMMENT 'ADD_SCENE_SEARCH 关注方式',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_wechat_user_user_id` (`user_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '正在现场服务号关注事件储存用户信息表';
+
+
+-- 用户 收藏/喜欢等状态
+drop TABLE if exists `sweet_user_relation_mdsk`;
+CREATE TABLE `sweet_user_relation_mdsk`
+(
+    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
+    `type`             tinyint    NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
+    `target_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
+    `manual_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
+    `status`            tinyint    NOT NULL DEFAULT 0 COMMENT '1是 0否',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_wechat_user_user_id` (`user_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '用户 收藏/喜欢等状态';
+
+

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -8,6 +8,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.liquidnet.service.base.ResponseDto;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.Objects;
  * @author liquidnet
  * @since 2021-07-27
  */
+@Slf4j
 @Service
 public class SweetWechatLoginServiceImpl {
 
@@ -42,6 +44,10 @@ public class SweetWechatLoginServiceImpl {
     private String mdskSecret;
 
     public ResponseDto userInfo(String code, String encryptedData, String iv, Integer type) {
+        log.info("\n参数code：[{}] ", code);
+        log.info("\n参数encryptedData：[{}] ", encryptedData);
+        log.info("\n参数iv：[{}] ", iv);
+        log.info("\n参数type：[{}] ", type);
         try {
             String appId = "";
             String appSecret = "";
@@ -62,6 +68,7 @@ public class SweetWechatLoginServiceImpl {
             WxMaConfig wxMaConfig = wxMaConfig(appId, appSecret);
             WxMaService wxMaService = wxMaService(wxMaConfig);
             WxMaJscode2SessionResult sessionInfo = wxMaService.getUserService().getSessionInfo(code);
+            log.info("\nWxMaJscode2SessionResult：[{}] ", sessionInfo.toString());
             if (null == sessionInfo) {
                 return ResponseDto.failure("login handler error");
             }
@@ -69,6 +76,7 @@ public class SweetWechatLoginServiceImpl {
             // 解密用户信息
             WxMaUserInfo wxUserInfo = wxMaService.getUserService().getUserInfo(sessionInfo.getSessionKey(),
                     encryptedData, iv);
+            log.info("\nWxMaUserInfo：[{}] ", wxUserInfo.toString());
             if (null == wxUserInfo) {
                 return ResponseDto.failure("wxUser not exist");
             }
@@ -76,6 +84,7 @@ public class SweetWechatLoginServiceImpl {
             // 解密手机号码信息
             WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService().getPhoneNoInfo(sessionInfo.getSessionKey(),
                     encryptedData, iv);
+            log.info("\nWxMaPhoneNumberInfo：[{}] ", wxMaPhoneNumberInfo.toString());
             if (Objects.isNull(wxMaPhoneNumberInfo) || StringUtils.isBlank(wxMaPhoneNumberInfo.getPhoneNumber())) {
                 return ResponseDto.failure("解密手机号码信息错误");
             }
@@ -92,6 +101,8 @@ public class SweetWechatLoginServiceImpl {
 
             return ResponseDto.success(userInfo);
         } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
             return ResponseDto.failure();
         }
     }