From 556123aab4164e64ce6327186eeff8c09677da28 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Sep 2024 15:51:24 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/OrderController.java | 10 ++++++++++
 .../cashierservice/dao/TbOrderInfoMapper.java      |  4 ++++
 .../cashierservice/service/OrderService.java       |  8 ++++++++
 src/main/resources/mapper/TbOrderInfoMapper.xml    | 14 ++++++++++----
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index b43ec8a..64491fc 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.chaozhanggui.system.cashierservice.entity.TbShopTable;
 import com.chaozhanggui.system.cashierservice.entity.dto.OrderDto;
 import com.chaozhanggui.system.cashierservice.service.OrderService;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Map;
 
 @CrossOrigin(origins = "*")
 @RestController
@@ -51,6 +53,14 @@ public class OrderController {
         return orderService.orderList(userId,page,size,status);
     }
 
+    @PostMapping("/rmOrder")
+    private Result rmOrder(@RequestBody Map<String, Object> map){
+        if (ObjectUtil.isEmpty(map) || map.size() <= 0 || !map.containsKey("orderId") || ObjectUtil.isEmpty(map.get("orderId"))) {
+            return Result.fail("订单号不允许为空");
+        }
+        return orderService.rmOrder(Integer.valueOf(map.get("orderId").toString()));
+    }
+
     @GetMapping("/tradeIntegral")
     private Result tradeIntegral(@RequestParam("userId") String userId, @RequestParam("id") String id) throws IOException, ParseException {
         return orderService.tradeIntegral(userId,id);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
index 20d3776..0affb60 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbOrderInfoMapper.java
@@ -11,6 +11,10 @@ import java.util.List;
 @Component
 @Mapper
 public interface TbOrderInfoMapper {
+
+    /**
+     * 逻辑删除
+     */
     int deleteByPrimaryKey(Integer id);
 
     int insert(TbOrderInfo record);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index ccb8505..23c2434 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -212,6 +212,14 @@ public class OrderService {
         return Result.success(CodeEnum.ENCRYPT, orderVo);
     }
 
+    public Result rmOrder(Integer orderId) {
+        int i = orderInfoMapper.deleteByPrimaryKey(orderId);
+        if (i > 0) {
+            return Result.success(CodeEnum.SUCCESS);
+        }
+        return Result.fail("删除失败");
+    }
+
 
     public Result orderList(Integer userId, Integer page, Integer size, String status) {
 //        TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(userId);
diff --git a/src/main/resources/mapper/TbOrderInfoMapper.xml b/src/main/resources/mapper/TbOrderInfoMapper.xml
index 97196ca..9eedfa9 100644
--- a/src/main/resources/mapper/TbOrderInfoMapper.xml
+++ b/src/main/resources/mapper/TbOrderInfoMapper.xml
@@ -65,10 +65,15 @@
         from tb_order_info
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from tb_order_info
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+<!--    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">-->
+<!--        delete from tb_order_info-->
+<!--        where id = #{id,jdbcType=INTEGER}-->
+<!--    </delete>-->
+    <update id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        update tb_order_info
+        set is_del = 1
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 
     <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo"
             useGeneratedKeys="true" keyProperty="id">
@@ -550,6 +555,7 @@
 
         where user_id = #{userId}
         and order_type='miniapp'
+        and is_del != 1
         <if test="status != null and status != ''">
             <choose>
                 <when test="status == 'unpaid'">

From e32476cb3b9d022723218dabfc5f26fcdde673bf Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Sep 2024 17:08:59 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/impl/TbUserCouponsServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
index 41744c4..bcf02ec 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
@@ -52,11 +52,11 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
         List<ShopUserListVo> tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString());
         if (!CollectionUtils.isEmpty(tbShopUsers)) {
             tbShopUsers.forEach(s -> {
-                if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() != 0)) {
+                if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 0)) {
                     List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
                     result.addAll(unuseCoupon);
                 }
-                if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() != 1)) {
+                if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 1)) {
                     List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
                     result.addAll(useCoupon);
                 }

From c0ad62aaff8d22b4d7298f9ea9ff979c8e289c6d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 2 Sep 2024 17:59:44 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=20=E5=BA=97=E9=93=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/TbActivateInRecordMapper.java          |  2 +-
 .../dao/TbActivateOutRecordMapper.java         |  2 +-
 .../cashierservice/entity/vo/UserCouponVo.java |  1 +
 .../service/impl/TbUserCouponsServiceImpl.java | 13 +++++++------
 .../mapper/TbActivateInRecordMapper.xml        | 18 +++++++++++-------
 .../mapper/TbActivateOutRecordMapper.xml       | 13 +++++++++----
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
index 86ad0ee..df4b1d5 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java
@@ -33,7 +33,7 @@ public interface TbActivateInRecordMapper {
     List<TbActivateInRecord> queryAll(TbActivateInRecord tbActivateInRecord);
 
     List<TbProduct> queryByVipIdAndShopId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
-    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
+    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("shopName")String shopName);
     int queryByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
     List<TbActivateInRecord> queryAllByVipIdAndShopIdAndProId(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId,@Param("productId") Integer productId);
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
index 23c1983..7b8b5ba 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java
@@ -30,7 +30,7 @@ public interface TbActivateOutRecordMapper {
      */
     List<TbActivateOutRecord> queryAll(TbActivateOutRecord tbActivateOutRecord);
 
-    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId);
+    List<UserCouponVo> queryVipPro(@Param("vipUserId") Integer vipUserId, @Param("shopId") Integer shopId, @Param("shopName") String shopName);
 
 
     /**
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
index 553002f..8dfec49 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java
@@ -14,6 +14,7 @@ public class UserCouponVo {
      * 卷描述
      */
     private String detail;
+    private String shopName;
     /**
      * 优惠金额
      */
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
index bcf02ec..5236c6c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbUserCouponsServiceImpl.java
@@ -1,9 +1,7 @@
 package com.chaozhanggui.system.cashierservice.service.impl;
 
-import com.chaozhanggui.system.cashierservice.dao.TbActivateInRecordMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbActivateOutRecordMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbShopUserMapper;
-import com.chaozhanggui.system.cashierservice.dao.TbUserCouponsMapper;
+import com.chaozhanggui.system.cashierservice.dao.*;
+import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
 import com.chaozhanggui.system.cashierservice.entity.dto.UserCouponDto;
 import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo;
 import com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo;
@@ -36,6 +34,8 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
     private TbActivateOutRecordMapper outRecordMapper;
     @Autowired
     private TbShopUserMapper tbShopUserMapper;
+    @Autowired
+    private TbShopInfoMapper tbShopInfoMapper;
 
 
     /**
@@ -52,12 +52,13 @@ public class TbUserCouponsServiceImpl implements TbUserCouponsService {
         List<ShopUserListVo> tbShopUsers = tbShopUserMapper.selectByUserId(couponDto.getUserId().toString(), couponDto.getShopId()==null?null:couponDto.getShopId().toString());
         if (!CollectionUtils.isEmpty(tbShopUsers)) {
             tbShopUsers.forEach(s -> {
+                TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(s.getShopId().intValue());
                 if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 0)) {
-                    List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
+                    List<UserCouponVo> unuseCoupon = inRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName());
                     result.addAll(unuseCoupon);
                 }
                 if (couponDto.getStatus()==null || (couponDto.getStatus() != null && couponDto.getStatus() == 1)) {
-                    List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue());
+                    List<UserCouponVo> useCoupon = outRecordMapper.queryVipPro(s.getMemberId().intValue(), s.getShopId().intValue(),shopInfo.getShopName());
                     result.addAll(useCoupon);
                 }
             });
diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml
index d5e9e89..6d9ad84 100644
--- a/src/main/resources/mapper/TbActivateInRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml
@@ -40,15 +40,19 @@
     </select>
 
     <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
-        SELECT tb_product.name                     as detail,
-               0                                   as status,
-               sum(tb_activate_in_record.over_num) as num,
-               2                                   as type
+        SELECT tb_product.name as detail,
+        0 as status,
+        sum(tb_activate_in_record.over_num) as num,
+        <choose>
+            <when test="shopName != null and shopName != ''">#{shopName}</when>
+            <otherwise>''</otherwise>
+        </choose> AS shopName,
+        2 as type
         FROM tb_activate_in_record
-                 LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
+        LEFT JOIN tb_product ON tb_activate_in_record.pro_id = tb_product.id
         WHERE vip_user_id = #{vipUserId}
-          and tb_activate_in_record.shop_id = #{shopId}
-          and num!=0
+        and tb_activate_in_record.shop_id = #{shopId}
+        and num!=0
         group by tb_activate_in_record.pro_id
     </select>
 
diff --git a/src/main/resources/mapper/TbActivateOutRecordMapper.xml b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
index 278b4fd..9e50eca 100644
--- a/src/main/resources/mapper/TbActivateOutRecordMapper.xml
+++ b/src/main/resources/mapper/TbActivateOutRecordMapper.xml
@@ -29,10 +29,15 @@
 
 
     <select id="queryVipPro" resultType="com.chaozhanggui.system.cashierservice.entity.vo.UserCouponVo">
-        SELECT tb_product.NAME                AS detail,
-               1                              AS status,
-               tb_activate_out_record.use_num AS num,
-               2                              AS type
+        SELECT tb_product.NAME AS detail,
+        1 AS status,
+        tb_activate_out_record.use_num AS num,
+        <choose>
+            <when test="shopName != null and shopName != ''">#{shopName}</when>
+            <otherwise>''</otherwise>
+        </choose>
+        AS shopName,
+        2 AS type
         FROM tb_activate_out_record
                  LEFT JOIN tb_product ON tb_activate_out_record.pro_id = tb_product.id
                  LEFT JOIN tb_activate_in_record ON tb_activate_in_record.id = tb_activate_out_record.give_id

From 1afcf13d26b6c14a7b77f9638237db3dd98ffa5c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 4 Sep 2024 11:30:02 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=20=E6=96=B0=E5=A2=9E=20pre=20=E9=A2=84=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml        |  9 ++--
 ...plication-dev2.yml => application-pre.yml} | 20 +++----
 src/main/resources/application-test.yml       | 53 -------------------
 3 files changed, 14 insertions(+), 68 deletions(-)
 rename src/main/resources/{application-dev2.yml => application-pre.yml} (79%)
 delete mode 100644 src/main/resources/application-test.yml

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 638ac33..12c9b81 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,11 +1,8 @@
 spring:
   datasource:
-#    url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false
-#    username: root
-#    password: mysqlroot@123
-    url: jdbc:mysql://101.37.12.135:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
-    username: fycashier
-    password: Twc6MrzzjBiWSsjh
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
+    username: cashier
+    password: Cashier@1@
     driver-class-name: com.mysql.cj.jdbc.Driver
     initialSize: 5
     minIdle: 5
diff --git a/src/main/resources/application-dev2.yml b/src/main/resources/application-pre.yml
similarity index 79%
rename from src/main/resources/application-dev2.yml
rename to src/main/resources/application-pre.yml
index c4924e0..e2140ec 100644
--- a/src/main/resources/application-dev2.yml
+++ b/src/main/resources/application-pre.yml
@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false
-    username: root
-    password: mysqlroot@123
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
+    username: cashier
+    password: Cashier@1@
     driver-class-name: com.mysql.cj.jdbc.Driver
     initialSize: 5
     minIdle: 5
@@ -15,7 +15,7 @@ spring:
     # redis数据库索引（默认为0），我们使用索引为3的数据库，避免和其他数据库冲突
     database: 0
     # redis服务器地址（默认为localhost）
-    host: 101.37.12.135
+    host: localhost
     # redis端口（默认为6379）
     port: 6379
     # redis访问密码（默认为空）
@@ -33,12 +33,11 @@ spring:
   main:
     allow-circular-references: true
   rabbitmq:
-    host: 101.37.12.135
+    host: localhost
     port: 5672
     username: admin
     password: Czg666888
 
-
 mybatis:
   configuration:
     map-underscore-to-camel-case: true
@@ -55,9 +54,12 @@ thirdPay:
   callFSTBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyfstCallBack
   songOrderBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/songOrderCallBack
 server:
-  port: 9889
-prod: devyhq
-queue: cart_queue_putdevyhq
+  port: 9888
+prod: dev1
+queue: cart_queue_putdev1
+subscribe:
+  message:
+    miniprogramState: trial
 
 
 
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
deleted file mode 100644
index 891e93b..0000000
--- a/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false
-    username: root
-    password: mysqlroot@123
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initialSize: 5
-    minIdle: 5
-    maxActive: 20
-    maxWait: 60000
-  logging:
-    level:
-      com.chaozhanggui.system.openness: info
-  redis:
-    # redis数据库索引（默认为0），我们使用索引为3的数据库，避免和其他数据库冲突
-    database: 0
-    # redis服务器地址（默认为localhost）
-    host: 101.37.12.135
-    # redis端口（默认为6379）
-    port: 6379
-    # redis访问密码（默认为空）
-    password: 111111
-    # redis连接超时时间（单位为毫秒）
-    timeout: 1000
-    block-when-exhausted: true
-    # redis连接池配置
-    jedis:
-      pool:
-        max-active: 8
-        max-idle: 1024
-        min-idle: 0
-        max-wait: -1
-  main:
-    allow-circular-references: true
-  rabbitmq:
-    host: 101.37.12.135
-    port: 5672
-    username: admin
-    password: Czg666888
-
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath:mapper/*.xml
-ysk:
-  url: https://gatewaytestapi.sxczgkj.cn/gate-service/
-  callBackurl: https://cashierapplet.sxczgkj.cn/cashierService/notify/notifyCallBack
-  callBackGroupurl: https://cashierapplet.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
-  callBackIn: https://cashierapplet.sxczgkj.cn/cashierService/notify/memberInCallBack
-  default: 18710449883
-
-

From 607c7304e3d79d9c07ce9500e39ae5cac0afc64b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 4 Sep 2024 16:35:35 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E8=A1=A8=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/dao/TbShopAdDao.java   | 2 +-
 .../system/cashierservice/dao/TbShopSongMapper.java           | 4 ++--
 .../system/cashierservice/dao/TbShopSongOrderMapper.java      | 2 +-
 src/main/resources/mapper/TbShopSongMapper.xml                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopAdDao.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopAdDao.java
index 3030d0f..5cbe34a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopAdDao.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopAdDao.java
@@ -17,7 +17,7 @@ public interface TbShopAdDao {
      *
      * @return 对象列表
      */
-    @Select("select * from fycashier.tb_shop_ad where (shop_id = #{songId} or shop_id = 1) and status=1")
+    @Select("select * from tb_shop_ad where (shop_id = #{songId} or shop_id = 1) and status=1")
     List<TbShopAd> shopAdList(Integer shopId);
 }
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongMapper.java
index c998a25..77196f8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongMapper.java
@@ -30,10 +30,10 @@ public interface TbShopSongMapper {
 
     List<TbShopSong> selectAllAndSearch(Integer shopId, String keyWord);
 
-    @Select("select * from fycashier.tb_shop_song where id=#{songId} and status=1")
+    @Select("select * from tb_shop_song where id=#{songId} and status=1")
     TbShopSong selectById(@Param("songId") Integer songId);
 
 
-    @Update("update fycashier.tb_shop_song set sales_number=sales_number+#{num} where id=#{id}")
+    @Update("update tb_shop_song set sales_number=sales_number+#{num} where id=#{id}")
     int incrNum(@Param("num") Integer num,@Param("id") Integer id);
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
index 7c461ed..ed7720b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
@@ -48,7 +48,7 @@ public interface TbShopSongOrderMapper {
             "          AND a.id=#{id}")
     Map<String, Object> selectByUserIdAndId(@Param("openId") String openId, @Param("id") Integer id);
 
-    @Select("select * from fycashier.tb_shop_song_order where order_no=#{orderNo};")
+    @Select("select * from tb_shop_song_order where order_no=#{orderNo};")
     TbShopSongOrder selectByOrderNo(@Param("orderNo") String orderNo);
 
     @Delete("DELETE FROM tb_shop_song_order\n" +
diff --git a/src/main/resources/mapper/TbShopSongMapper.xml b/src/main/resources/mapper/TbShopSongMapper.xml
index 6f213b7..f3f104c 100644
--- a/src/main/resources/mapper/TbShopSongMapper.xml
+++ b/src/main/resources/mapper/TbShopSongMapper.xml
@@ -36,7 +36,7 @@
     </select>
     <select id="selectAllAndSearch" resultType="com.chaozhanggui.system.cashierservice.entity.TbShopSong">
         select *
-        from fycashier.tb_shop_song where shop_id=#{shopId}
+        from tb_shop_song where shop_id=#{shopId}
         and status=1
         <if test="keyWord != null and keyWord != ''">
             and name like CONCAT('%',#{keyWord},'%')

From 7e21f59b7d876d4638170c7042a0cae922cd57a8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 5 Sep 2024 10:09:07 +0800
Subject: [PATCH 6/8] =?UTF-8?q?pre=20=E5=86=85=E7=BD=91=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-pre.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application-pre.yml b/src/main/resources/application-pre.yml
index e2140ec..6a25699 100644
--- a/src/main/resources/application-pre.yml
+++ b/src/main/resources/application-pre.yml
@@ -1,6 +1,7 @@
 spring:
   datasource:
-    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
+    # 内网地址
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
     username: cashier
     password: Cashier@1@
     driver-class-name: com.mysql.cj.jdbc.Driver

From 3ee4ea9870a76043f5e9ade48d1463d3407e393b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 24 Sep 2024 09:53:14 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=92=8C=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   6 +
 .../cashierservice/auth/LoginFilter.java      |   1 +
 .../controller/LoginContoller.java            | 137 +++++++++---------
 .../cashierservice/service/LoginService.java  |  82 ++++++++---
 src/main/resources/application.yml            |  14 +-
 5 files changed, 148 insertions(+), 92 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ea4374..d0ba120 100644
--- a/pom.xml
+++ b/pom.xml
@@ -203,6 +203,12 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
+        <!-- 支付宝服务端通用SDK -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.39.165.ALL</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
index d2d0f9c..f15ea8e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java
@@ -49,6 +49,7 @@ public class LoginFilter implements Filter {
 
 //            "cashierService/login/**",//登录部分接口不校验
             "cashierService/login/wx/**",//登录部分接口不校验
+            "cashierService/login/auth/**",//登录部分接口不校验
             "cashierService/login/app/login",//登录部分接口不校验
             "cashierService/product/queryProduct",
             "cashierService/product/queryProductSku",
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
index 8fd3de8..ab82adf 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -4,6 +4,9 @@ import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.chaozhanggui.system.cashierservice.alipayUtil.AlipayUtil;
+import com.chaozhanggui.system.cashierservice.auth.AuthSource;
 import com.chaozhanggui.system.cashierservice.dao.TbMerchantAccountMapper;
 import com.chaozhanggui.system.cashierservice.entity.TbMerchantAccount;
 import com.chaozhanggui.system.cashierservice.entity.TbUserInfo;
@@ -16,10 +19,13 @@ import com.chaozhanggui.system.cashierservice.service.LoginService;
 import com.chaozhanggui.system.cashierservice.service.OnlineUserService;
 import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
 import com.chaozhanggui.system.cashierservice.sign.Result;
-import com.chaozhanggui.system.cashierservice.util.*;
+import com.chaozhanggui.system.cashierservice.util.IpUtil;
+import com.chaozhanggui.system.cashierservice.util.MD5Utils;
+import com.chaozhanggui.system.cashierservice.util.StringUtil;
+import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -60,28 +66,27 @@ public class LoginContoller {
     @Autowired
     RedisUtil redisUtil;
 
+    @Resource
+    AlipayUtil alipayUtil;
+
 
     @RequestMapping("/wx/business/login")
-    public Result wxBusinessLogin(@RequestParam(value = "code", required = false) String code,
-                                  @RequestParam(value = "shopId", required = false) String shopId
-    ) {
+    public Result wxBusinessLogin(@RequestParam(value = "code", required = false) String code, @RequestParam(value = "shopId", required = false) String shopId) {
 
         JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, businessAppId, businessSecrete);
         String openid = SessionKeyOpenId.getString("openid");
-        if(Objects.isNull(openid)){
+        if (Objects.isNull(openid)) {
             return Result.fail("获取微信id失败");
         }
 
-        return loginService.wxBusinessLogin(openid,shopId);
+        return loginService.wxBusinessLogin(openid, shopId);
     }
 
     @GetMapping("/wx/business/openId")
-    public Result getOpenId(
-            @RequestParam String code
-    ) {
+    public Result getOpenId(@RequestParam String code) {
         JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
         String openid = SessionKeyOpenId.getString("openid");
-        if(Objects.isNull(openid)){
+        if (Objects.isNull(openid)) {
             return Result.fail("获取微信id失败");
         }
 
@@ -95,48 +100,41 @@ public class LoginContoller {
      * @param map
      * @return
      */
-    @RequestMapping("/wx/custom/login")
-    public Result wxCustomLogin(HttpServletRequest request, @RequestBody Map<String, String> map) {
+    @RequestMapping("/auth/custom/login")
+    @SneakyThrows
+    public Result authCustomLogin(HttpServletRequest request, @RequestBody Map<String, String> map) {
         if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
             Result.fail("code不能为空");
         }
-        String code = map.get("code").toString();
-        String rawData = map.get("rawData");
-//        String signature = map.get("signature");
-//        String encryptedData = map.get("encryptedData");
-//        String ivStr = map.get("iv");
-//        String phone = map.get("phone");
-        // 用户非敏感信息：rawData
-        // 签名：signature
-        JSONObject rawDataJson = JSON.parseObject(rawData);
-        // 1.接收小程序发送的code
-        // 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
-        JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
-        // 3.接收微信接口服务 获取返回的参数
-        String openid = SessionKeyOpenId.getString("openid");
-//        String sessionKey = SessionKeyOpenId.getString("session_key");
-
-        // 4.校验签名 小程序发送的签名signature与服务器端生成的签名signature2 = sha1(rawData + sessionKey)
-//        String signature2 = DigestUtils.sha1Hex(rawData + sessionKey);
-//        if (!signature.equals(signature2)) {
-//            return Result.fail("签名校验失败");
-//        }
-//        String phone = "";
-//        try{
-//            String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
-//            if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
-//            }//                phone =JSONObject.parseObject(data).get("phoneNumber").toString();
-//        }catch (Exception e){
-//            log.info("登录传参：获取手机号失败{}",e.getMessage());
-//        }
-        String nickName = rawDataJson.getString("nickName");
-        String avatarUrl = rawDataJson.getString("avatarUrl");
-        try {
-            return loginService.wxCustomLogin(openid, avatarUrl, nickName, "", IpUtil.getIpAddr(request));
-        } catch (Exception e) {
-            e.printStackTrace();
+        // 三方登录来源 wechat、alipay
+        String source = map.getOrDefault("source",AuthSource.WECHAT.getValue());
+        String code = map.get("code");
+        if(AuthSource.WECHAT.getValue().equals(source)){
+            String rawData = map.get("rawData");
+            // 签名：signature
+            JSONObject rawDataJson = JSON.parseObject(rawData);
+            // 1.接收小程序发送的code
+            // 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
+            JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
+            // 3.接收微信接口服务 获取返回的参数
+            String openid = SessionKeyOpenId.getString("openid");
+            String nickName = rawDataJson.getString("nickName");
+            String avatarUrl = rawDataJson.getString("avatarUrl");
+            try {
+                return loginService.wxCustomLogin(openid, avatarUrl, nickName, "", IpUtil.getIpAddr(request));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if(AuthSource.ALIPAY.getValue().equals(source)){
+            try {
+                String openId = alipayUtil.getOpenId(code);
+                return loginService.alipayCustomLogin(openId);
+            }catch (AlipayApiException e){
+                return Result.fail("登录失败："+e.getErrMsg());
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
-
         return Result.fail("登录失败");
 
     }
@@ -179,7 +177,7 @@ public class LoginContoller {
 //        return Result.fail("获取手机号失败,请重试！");
 //    }
     @RequestMapping("getPhoneNumber")
-    public Result getPhoneNumber(@RequestHeader String openId,@RequestBody Map<String, String> map) {
+    public Result getPhoneNumber(@RequestHeader String openId, @RequestBody Map<String, String> map) {
 
         if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
             Result.fail("code不能为空");
@@ -201,14 +199,14 @@ public class LoginContoller {
         try {
             if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
 //                if (!map.containsKey("shopId") || ObjectUtil.isEmpty(map.get("shopId"))) {
-                    return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber"));
+                return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber"));
 //                }
 //                log.info("登录传参 获取手机号成功 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,JSONObject.parseObject(data).get("phoneNumber"));
 //                return loginService.upPhone(openId,JSONObject.parseObject(data).get("phoneNumber").toString(),map.get("shopId").toString());
             }
-        } catch (Exception e){
+        } catch (Exception e) {
 //            e.printStackTrace();
-            log.info("登录传参 获取手机号失败 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,data);
+            log.info("登录传参 获取手机号失败 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},", sessionKey, encryptedData, ivStr, data);
         }
         return Result.fail("获取手机号失败,请重试！");
     }
@@ -254,10 +252,8 @@ public class LoginContoller {
      * @return
      */
     @GetMapping("createCardNo")
-    public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id,
-                               @RequestParam("shopId") String shopId
-                               ) {
-        return loginService.createCardNo(id, openId,shopId);
+    public Result createCardNo(@RequestHeader("openId") String openId, @RequestHeader("token") String token, @RequestHeader("id") String id, @RequestParam("shopId") String shopId) {
+        return loginService.createCardNo(id, openId, shopId);
     }
 
     @GetMapping("/userInfo")
@@ -267,6 +263,7 @@ public class LoginContoller {
 
     /**
      * 更新用户信息
+     *
      * @param token
      * @param userInfo
      * @return
@@ -281,16 +278,16 @@ public class LoginContoller {
     }
 
     @PostMapping(value = "/upPass")
-    public Result upPass(@RequestHeader String token,@RequestBody UserPassDto passVo){
+    public Result upPass(@RequestHeader String token, @RequestBody UserPassDto passVo) {
         String userId = TokenUtil.parseParamFromToken(token).getString("userId");
         String newPass = MD5Utils.MD5Encode(passVo.getNewPass(), "utf-8");
         if (ObjectUtil.isNull(passVo.getCode())) {
             String oldPass = MD5Utils.MD5Encode(passVo.getOldPass(), "utf-8");
-            return loginService.upPass(userId,oldPass, newPass);
+            return loginService.upPass(userId, oldPass, newPass);
         } else {
             boolean tf = loginService.validate(passVo.getCode(), passVo.getPhone());
             if (tf) {
-                TbUserInfo userInfo=new TbUserInfo();
+                TbUserInfo userInfo = new TbUserInfo();
                 userInfo.setId(Integer.valueOf(userId));
                 userInfo.setPassword(newPass);
                 return loginService.upUserInfo(userInfo);
@@ -301,16 +298,16 @@ public class LoginContoller {
     }
 
     @PostMapping(value = "modityPass")
-    public Result modityPass(@RequestHeader String token,@RequestBody UserPassDto passVo){
+    public Result modityPass(@RequestHeader String token, @RequestBody UserPassDto passVo) {
         String userId = TokenUtil.parseParamFromToken(token).getString("userId");
         String newPass = MD5Utils.MD5Encode(passVo.getNewPass(), "utf-8");
         if (ObjectUtil.isNull(passVo.getCode())) {
             String oldPass = MD5Utils.MD5Encode(passVo.getOldPass(), "utf-8");
-            return loginService.upPass(userId,oldPass, newPass);
+            return loginService.upPass(userId, oldPass, newPass);
         } else {
             boolean tf = loginService.validate(passVo.getCode(), passVo.getPhone());
             if (tf) {
-                TbUserInfo userInfo=new TbUserInfo();
+                TbUserInfo userInfo = new TbUserInfo();
                 userInfo.setId(Integer.valueOf(userId));
                 userInfo.setPassword(newPass);
                 return loginService.upUserInfo(userInfo);
@@ -359,12 +356,12 @@ public class LoginContoller {
             }
             //验证密码
             String mdPasswordString = MD5Utils.MD5Encode(authUserDto.getPassword(), "utf-8");
-            return loginService.appLogin(authUserDto.getUsername(),openid, mdPasswordString);
+            return loginService.appLogin(authUserDto.getUsername(), openid, mdPasswordString);
         } else {
 //            tf = true;
             tf = loginService.validate(authUserDto.getCode(), authUserDto.getUsername());
             if (tf) {
-                return loginService.appLogin(authUserDto.getUsername(),openid, null);
+                return loginService.appLogin(authUserDto.getUsername(), openid, null);
             } else {
                 return Result.fail("验证码输入有误");
             }
@@ -393,29 +390,31 @@ public class LoginContoller {
 
     /**
      * 重置资金密码
+     *
      * @param token
      * @param map
      * @return
      */
     @RequestMapping("resetPwd")
-    public Result resetPwd(@RequestHeader String token,@RequestBody Map<String, Object> map){
+    public Result resetPwd(@RequestHeader String token, @RequestBody Map<String, Object> map) {
 
         String userId = TokenUtil.parseParamFromToken(token).getString("userId");
-        return loginService.resetPwd(userId,map);
+        return loginService.resetPwd(userId, map);
 
     }
 
 
     /**
      * 修改密码
+     *
      * @param token
      * @param map
      * @return
      */
     @RequestMapping("mpdifyPwd")
-    public Result mpdifyPwd(@RequestHeader String token,@RequestBody Map<String, Object> map){
+    public Result mpdifyPwd(@RequestHeader String token, @RequestBody Map<String, Object> map) {
         String userId = TokenUtil.parseParamFromToken(token).getString("userId");
-        return loginService.modifyPwd(userId,map);
+        return loginService.modifyPwd(userId, map);
     }
 
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index bf59077..4c1ba0e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -1,14 +1,14 @@
 package com.chaozhanggui.system.cashierservice.service;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.chaozhanggui.system.cashierservice.dao.*;
-import com.chaozhanggui.system.cashierservice.entity.*;
-import com.chaozhanggui.system.cashierservice.exception.MsgException;
+import com.chaozhanggui.system.cashierservice.entity.TbShopOpenId;
+import com.chaozhanggui.system.cashierservice.entity.TbShopUser;
+import com.chaozhanggui.system.cashierservice.entity.TbUserInfo;
+import com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg;
 import com.chaozhanggui.system.cashierservice.redis.RedisCst;
 import com.chaozhanggui.system.cashierservice.redis.RedisUtil;
 import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
@@ -141,34 +141,72 @@ public class LoginService {
 
     }
 
+    private void buildNewUserInfo(TbUserInfo userInfo) {
+        userInfo = new TbUserInfo();
+        userInfo.setAmount(BigDecimal.ZERO);
+        userInfo.setChargeAmount(BigDecimal.ZERO);
+        userInfo.setLineOfCredit(BigDecimal.ZERO);
+        userInfo.setConsumeNumber(0);
+        userInfo.setConsumeAmount(BigDecimal.ZERO);
+        userInfo.setTotalScore(0);
+        userInfo.setLockScore(0);
+        userInfo.setHeadImg("");
+        userInfo.setNickName("");
+        userInfo.setTelephone("");
+        userInfo.setStatus(Byte.parseByte("1"));
+        userInfo.setParentType("PERSON");
+        userInfo.setIsResource(Byte.parseByte("0"));
+        userInfo.setIsOnline(Byte.parseByte("0"));
+        userInfo.setIsVip(Byte.parseByte("0"));
+        userInfo.setIsAttentionMp(Byte.parseByte("0"));
+        userInfo.setIsPwd("0");
+        userInfo.setPwd(MD5Utils.md5("123456"));
+        userInfo.setCreatedAt(System.currentTimeMillis());
+        userInfo.setLastLogInAt(System.currentTimeMillis());
+        userInfo.setUpdatedAt(System.currentTimeMillis());
+    }
+
     public Result wxCustomLogin(String openId, String headImage, String nickName, String telephone, String ip) {
         TbUserInfo userInfo = tbUserInfoMapper.selectByOpenId(openId);
         if (ObjectUtil.isNull(userInfo)) {
             userInfo = new TbUserInfo();
-            userInfo.setAmount(BigDecimal.ZERO);
-            userInfo.setChargeAmount(BigDecimal.ZERO);
-            userInfo.setLineOfCredit(BigDecimal.ZERO);
-            userInfo.setConsumeNumber(0);
-            userInfo.setConsumeAmount(BigDecimal.ZERO);
-            userInfo.setTotalScore(0);
-            userInfo.setLockScore(0);
+            buildNewUserInfo(userInfo);
             userInfo.setHeadImg(ObjectUtil.isNotNull(headImage) ? headImage : "");
             userInfo.setNickName(ObjectUtil.isNotNull(nickName) ? nickName : "微信用户");
             userInfo.setTelephone(ObjectUtil.isNotNull(telephone) ? telephone : "");
-            userInfo.setMiniAppOpenId(openId);
-            userInfo.setStatus(Byte.parseByte("1"));
-            userInfo.setParentType("PERSON");
-            userInfo.setIsResource(Byte.parseByte("0"));
-            userInfo.setIsOnline(Byte.parseByte("0"));
-            userInfo.setIsVip(Byte.parseByte("0"));
             userInfo.setSourcePath("WECHAT-APP");
-            userInfo.setIsAttentionMp(Byte.parseByte("0"));
             userInfo.setSearchWord("||微信用户");
-            userInfo.setIsPwd("0");
-            userInfo.setPwd(MD5Utils.md5("123456"));
-            userInfo.setCreatedAt(System.currentTimeMillis());
-            userInfo.setLastLogInAt(System.currentTimeMillis());
+            userInfo.setMiniAppOpenId(openId);
+            tbUserInfoMapper.insert(userInfo);
+        } else {
             userInfo.setUpdatedAt(System.currentTimeMillis());
+            userInfo.setLastLogInAt(System.currentTimeMillis());
+            tbUserInfoMapper.updateByPrimaryKeySelective(userInfo);
+        }
+        //生成token 信息
+        String token = TokenUtil.generateToken(userInfo.getId(), userInfo.getMiniAppOpenId(), userInfo.getTelephone(), userInfo.getNickName());
+        Map<String, Object> map = new HashMap<>();
+        map.put("token", token);
+        map.put("userInfo", userInfo);
+        redisUtil.saveMessage(RedisCst.ONLINE_USER.concat(openId), JSON.toJSONString(map), 60 * 60 * 24 * 30L);
+        log.info("登录传参 结果：" + JSONUtil.toJSONString(map));
+        return Result.success(CodeEnum.SUCCESS, map);
+    }
+
+    /**
+     * 支付宝用户登录
+     * @param openId
+     * @return
+     */
+    public Result alipayCustomLogin(String openId) {
+        TbUserInfo userInfo = tbUserInfoMapper.selectByOpenId(openId);
+        if (ObjectUtil.isNull(userInfo)) {
+            userInfo = new TbUserInfo();
+            buildNewUserInfo(userInfo);
+            userInfo.setNickName("支付宝用户");
+            userInfo.setSourcePath("ALIPAY-APP");
+            userInfo.setSearchWord("||支付宝用户");
+            userInfo.setMiniAppOpenId(openId);
             tbUserInfoMapper.insert(userInfo);
         } else {
             userInfo.setUpdatedAt(System.currentTimeMillis());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3d23497..aee6778 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -24,7 +24,19 @@ wx:
     appId: wx212769170d2c6b2a
     secrete: 8492a7e8d55bbb1b57f5c8276ea1add0
     warnMsgTmpId: C08OUr80x6wGmUN1zpFhSQ3Sv7VF5vksdZigiEx2pD0
-
+alipay:
+  sdk:
+    config:
+      serverUrl: https://openapi.alipay.com/gateway.do
+      appId: 2021004145625815
+      privateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCAjDBuS8K/IJb9ui+KuNm/sTUdEiaji4BNpZ92avO1N5JpNlGmac6ec4p3tNFT950sBLcQkClcUpQxUHQzAT6DYNNXOKyvfI/EmcqwCw6PaMNLs/8cV//J2WWZBUhLaOsjKurpm9/3W5MnTh4BGxIfBoeBMA8f8K3BgKdmyKtvIEV2h2cyjsMskdn+g6oNZcmWcms0pvpPHyH46mRaGFhpp0v19wX3WsamGldh1L2VntmaDN3C2XbSrXv90XYp5bEUqwTbLwXpMAlzTibF56d/iqv9oYi8cpAKougUFLOymnbutLNs2tLrEDSFwHcmG2/wbZHybZyYcIgFgv4arf+tAgMBAAECggEAf7hKKlw1y6Z6vvAtalxNZUuRZSfyog3p1bwYWxTavZPQcZ7Zs0lvVDmiO1u5m/7q96BbryY9IhCeUv0H5uF2lhwu/3s9AEL3qTPQkeb6eXxyhhX6A9RfPdM1Qbtg4CQHdHKg4qjP9znSVHwmDZ0y/QaEvdPdQzPjv92u9c2tn4N4x6XyBYcU5gzxiJNnIugCmBgcJo/3H2fgV+XXEhORPvy5of9b4oATHEaLS/8dAS2wuOjhzaGS4MXp3VkXn3XaYjwSzaL03qYWA+xm+aO5sJv8bmqZW7sNVck5o3sPo7cQ4VkBFVzyrRdmJcxcSRJ9MsB9JsrhoKI8pgaXrVie4QKBgQDU2vai0lpBIK/0jzRpPNoqdT8lnafnnWni8nU4kfAh+gCLi+HBPhQRT0kv4unQc2q2/gALE7sgZVO00JGY5a3R0orsojPoUSZlpypGW7GGqKy576NHn0nw4o/PdfysT92VWgt1hlfTf6qfCDhfE9APU+RGvlSWXcT8nxVel3iUaQKBgQCamoJN6+4v+chJvL2nqV8NVVRLp0vDIHxs1QOtKwUodx8Qp1D6CJYtavCXn8aNUFVNQJPJ7TQPpJjXP2rI4SN01weDwx+I+wh8PBGHV6/234R+6TvFgY1PrYgCdfNP4i/E7B4uyEhAxdU73PB8qkqRAeJGok05p7oG71KCOBiYpQKBgEZfGflcuDAeAW5GRhqg3rP4zWa/R7qgZVh9tll8jjp9b96y4XFE99d9MgId8BVVgyt6sEL5Q/2C4ni+F9TH4n6jMADp42VkJuCmsqhOOlP9whU67+2G8Sgtj0QUivPg964f9ffl8XVgGOW5DwIIB9p5btggptCLscufQK5kP545AoGADBvf6tR4wl8w9b2HqTMV08iEIqzGvVC1Dh0c/Zop/EJgN4CzUfIMOSBwGaAVAApzs+pD6QPgGP2OTwWTioo/qa4R05sbxDHNN1XJFa2jhZV6HiqMWOrNs5jm1zJ/zRjtHuJTdtyO9CvKiLbESy9XScY4/8lEfSiK5HIoJzTXkFUCgYAkYkvkW6psJpWj05XWq44UN0n6QOU/Igl35Um/iuOMVhsTmIt09STQVTuzJzfH82+sCqoRsD1blE5unKNUC1DK77aNKTv3Z0dxN9R7FAyfZRiYQXTrbBPBqWjay6FCNxn8e8UsJN4Z6FIV2LGlQI114krSap1MALKLVvnld0NaUQ==
+      alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB
+decorator:
+  datasource:
+    p6spy:
+      logging: file
+      log-file: spy.log
+      log-format: executionTime:%(executionTime) ms | sql:%(sqlSingleLine)
 #
 spring:
   profiles:

From d9a5d041ae25f2bf2912bbf92981d1c6b3bc7350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 24 Sep 2024 09:53:47 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=92=8C=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/alipayUtil/AlipayUtil.java | 92 +++++++++++++++++++
 .../cashierservice/auth/AuthSource.java       | 35 +++++++
 2 files changed, 127 insertions(+)
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/alipayUtil/AlipayUtil.java
 create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/auth/AuthSource.java

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/alipayUtil/AlipayUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/alipayUtil/AlipayUtil.java
new file mode 100644
index 0000000..2ede67d
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/alipayUtil/AlipayUtil.java
@@ -0,0 +1,92 @@
+package com.chaozhanggui.system.cashierservice.alipayUtil;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.AlipayConfig;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付宝通用SDK工具类
+ *
+ * @author tankaikai
+ * @since 2024-09-23 16:15
+ */
+
+@Slf4j
+@Component
+public class AlipayUtil {
+
+    /**
+     * 网关地址 线上：https://openapi.alipay.com/gateway.do 沙箱：https://openapi.alipaydev.com/gateway.do
+     */
+    @Value("${alipay.sdk.config.serverUrl}")
+    private String serverUrl;
+    /**
+     * 应用ID
+     */
+    @Value("${alipay.sdk.config.appId}")
+    private String appId;
+    /**
+     * 应用私钥
+     */
+    @Value("${alipay.sdk.config.privateKey}")
+    private String privateKey;
+    /**
+     * 支付宝公钥
+     */
+    @Value("${alipay.sdk.config.alipayPublicKey}")
+    private String alipayPublicKey;
+
+    /**
+     * 创建支付宝客户端
+     * @return AlipayClient
+     */
+    @SneakyThrows
+    public AlipayClient createClient() {
+        AlipayConfig alipayConfig = new AlipayConfig();
+        //设置网关地址
+        alipayConfig.setServerUrl(serverUrl);
+        //设置应用ID
+        alipayConfig.setAppId(appId);
+        //设置应用私钥
+        alipayConfig.setPrivateKey(privateKey);
+        //设置支付宝公钥
+        alipayConfig.setAlipayPublicKey(alipayPublicKey);
+        return new DefaultAlipayClient(alipayConfig);
+    }
+
+    /**
+     * 获取支付宝用户的openId
+     * @param code  用户信息授权码
+     * @return openId
+     */
+    public String getOpenId(String code) throws AlipayApiException{
+        AlipaySystemOauthTokenRequest req = new AlipaySystemOauthTokenRequest();
+        //SDK已经封装掉了公共参数，这里只需要传入业务参数
+        req.setCode(code);
+        req.setGrantType("authorization_code");
+        //此次只是参数展示，未进行字符串转义，实际情况下请转义
+        //req.setBizContent("  {" + "    \"primary_industry_name\":\"IT科技/IT软件与服务\"," + "    \"primary_industry_code\":\"10001/20102\"," + "    \"secondary_industry_code\":\"10001/20102\"," + "    \"secondary_industry_name\":\"IT科技/IT软件与服务\"" + " }");
+        AlipaySystemOauthTokenResponse response;
+        try {
+            response = createClient().execute(req);
+        }catch (AlipayApiException e){
+            log.error("获取支付宝用户信息失败，错误码：{}，错误信息：{}", e.getErrCode(), e.getErrMsg());
+            throw e;
+        }
+        //调用失败
+        if (!response.isSuccess()) {
+            log.error("获取支付宝用户信息失败，错误码：{}，错误信息：{}", response.getSubCode(), response.getSubMsg());
+            throw new AlipayApiException(response.getSubCode(), response.getSubMsg());
+        }
+        //调用成功，则处理业务逻辑
+        return response.getOpenId();
+    }
+
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/AuthSource.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/AuthSource.java
new file mode 100644
index 0000000..11b952e
--- /dev/null
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/AuthSource.java
@@ -0,0 +1,35 @@
+package com.chaozhanggui.system.cashierservice.auth;
+
+/**
+ * 三方登录认证来源
+ * @author tankaikai
+ * @since 2024-09-23 17:51
+ */
+public enum AuthSource {
+    WECHAT("微信",  "wechat"),
+    ALIPAY("支付宝", "alipay");
+
+    private String name;
+    private String value;
+
+    AuthSource(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}