From 614ffc9abfe568b4fe1857330e54d559676d324e Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 23 Aug 2024 10:28:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9F=A5=E8=AF=A2=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/{TbMShopUser.java => TbShopUser.java}   | 14 ++++++--------
 .../cashier/mybatis/mapper/TbMShopUserMapper.java  |  5 ++---
 .../cashier/mybatis/mapper/TbOrderInfoMapper.java  |  2 --
 .../mybatis/service/TbMShopUserService.java        |  4 ++--
 .../service/impl/TbMShopUserServiceImpl.java       |  4 ++--
 .../ysk/cashier/service/impl/TbPayServiceImpl.java |  9 ++++-----
 .../main/resources/mapper/TbMShopUserMapper.xml    |  2 +-
 7 files changed, 17 insertions(+), 23 deletions(-)
 rename eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/{TbMShopUser.java => TbShopUser.java} (98%)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMShopUser.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopUser.java
similarity index 98%
rename from eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMShopUser.java
rename to eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopUser.java
index 19382b3b..5e3d56bd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbMShopUser.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopUser.java
@@ -2,8 +2,6 @@ package cn.ysk.cashier.mybatis.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import lombok.Data;
@@ -14,7 +12,7 @@ import lombok.Data;
  */
 @Table(name="tb_shop_user")
 @Data
-public class TbMShopUser implements Serializable {
+public class TbShopUser implements Serializable {
     /**
      * (随机)
      */
@@ -82,7 +80,7 @@ public class TbMShopUser implements Serializable {
     private String name;
 
     /**
-     * 
+     *
      */
     private String head_img;
 
@@ -142,12 +140,12 @@ public class TbMShopUser implements Serializable {
     private Integer sort;
 
     /**
-     * 
+     *
      */
     private Long created_at;
 
     /**
-     * 
+     *
      */
     private Long updated_at;
 
@@ -174,7 +172,7 @@ public class TbMShopUser implements Serializable {
         if (getClass() != that.getClass()) {
             return false;
         }
-        TbMShopUser other = (TbMShopUser) that;
+        TbShopUser other = (TbShopUser) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getAmount() == null ? other.getAmount() == null : this.getAmount().equals(other.getAmount()))
             && (this.getCredit_amount() == null ? other.getCredit_amount() == null : this.getCredit_amount().equals(other.getCredit_amount()))
@@ -281,4 +279,4 @@ public class TbMShopUser implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
index a308f567..e3b4285a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
@@ -1,7 +1,6 @@
 package cn.ysk.cashier.mybatis.mapper;
 
-import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
-import cn.ysk.cashier.mybatis.entity.TbMShopUser;
+import cn.ysk.cashier.mybatis.entity.TbShopUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -16,7 +15,7 @@ import java.util.Map;
 * @createDate 2024-07-06 11:46:46
 * @Entity cn.ysk.cashier.mybatis.entity.TbMShopUser
 */
-public interface TbMShopUserMapper extends BaseMapper<TbMShopUser> {
+public interface TbMShopUserMapper extends BaseMapper<TbShopUser> {
     @Select("<script>" +
             "SELECT \n" +
             "    COUNT(DISTINCT a.id) AS userTotal, \n" +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderInfoMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderInfoMapper.java
index 88e9b588..7ab2daeb 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderInfoMapper.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbOrderInfoMapper.java
@@ -1,6 +1,5 @@
 package cn.ysk.cashier.mybatis.mapper;
 
-import cn.ysk.cashier.mybatis.entity.TbMShopUser;
 import cn.ysk.cashier.pojo.order.TbOrderInfo;
 import cn.ysk.cashier.vo.TbOrderSaleVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -8,7 +7,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.List;
 
 public interface TbOrderInfoMapper extends BaseMapper<TbOrderInfo> {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbMShopUserService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbMShopUserService.java
index c1fa81ab..e5d6d735 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbMShopUserService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbMShopUserService.java
@@ -1,7 +1,7 @@
 package cn.ysk.cashier.mybatis.service;
 
 import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
-import cn.ysk.cashier.mybatis.entity.TbMShopUser;
+import cn.ysk.cashier.mybatis.entity.TbShopUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【tb_shop_user(商户储值会员)】的数据库操作Service
 * @createDate 2024-07-06 11:46:46
 */
-public interface TbMShopUserService extends IService<TbMShopUser> {
+public interface TbMShopUserService extends IService<TbShopUser> {
 
     /**
      * 查询会员概述信息
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMShopUserServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMShopUserServiceImpl.java
index d2f005c3..c3b4bc28 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMShopUserServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbMShopUserServiceImpl.java
@@ -2,7 +2,7 @@ package cn.ysk.cashier.mybatis.service.impl;
 
 import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.ysk.cashier.mybatis.entity.TbMShopUser;
+import cn.ysk.cashier.mybatis.entity.TbShopUser;
 import cn.ysk.cashier.mybatis.service.TbMShopUserService;
 import cn.ysk.cashier.mybatis.mapper.TbMShopUserMapper;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 * @createDate 2024-07-06 11:46:46
 */
 @Service
-public class TbMShopUserServiceImpl extends ServiceImpl<TbMShopUserMapper, TbMShopUser>
+public class TbMShopUserServiceImpl extends ServiceImpl<TbMShopUserMapper, TbShopUser>
     implements TbMShopUserService{
 
     private final TbMShopUserMapper shopUserMapper;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
index f6d34bee..0c6ab6f8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
@@ -4,7 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.ysk.cashier.dto.ScanPayDTO;
 import cn.ysk.cashier.exception.BadRequestException;
-import cn.ysk.cashier.mybatis.entity.TbMShopUser;
+import cn.ysk.cashier.mybatis.entity.TbShopUser;
 import cn.ysk.cashier.mybatis.entity.TbOrderPayment;
 import cn.ysk.cashier.mybatis.entity.TbShopUserFlow;
 import cn.ysk.cashier.mybatis.mapper.*;
@@ -14,7 +14,6 @@ import cn.ysk.cashier.pojo.order.TbCashierCart;
 import cn.ysk.cashier.pojo.order.TbOrderDetail;
 import cn.ysk.cashier.pojo.order.TbOrderInfo;
 import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
-import cn.ysk.cashier.pojo.shop.TbShopUser;
 import cn.ysk.cashier.repository.shop.TbMerchantThirdApplyRepository;
 import cn.ysk.cashier.service.TbPayService;
 import cn.ysk.cashier.utils.RabbitMsgUtils;
@@ -306,9 +305,9 @@ public class TbPayServiceImpl implements TbPayService {
 
 
         // 扣减会员余额
-        TbMShopUser shopUser = shopUserMapper.selectOne(new LambdaUpdateWrapper<TbMShopUser>()
-                .eq(TbMShopUser::getStatus, 1)
-                .eq(TbMShopUser::getId, orderInfo.getUserId()));
+        TbShopUser shopUser = shopUserMapper.selectOne(new LambdaUpdateWrapper<TbShopUser>()
+                .eq(TbShopUser::getStatus, 1)
+                .eq(TbShopUser::getId, orderInfo.getUserId()));
 
         if (shopUser == null) {
             throw new BadRequestException("用户不存在或已被禁用");
diff --git a/eladmin-system/src/main/resources/mapper/TbMShopUserMapper.xml b/eladmin-system/src/main/resources/mapper/TbMShopUserMapper.xml
index 5f2c0ca4..790576ab 100644
--- a/eladmin-system/src/main/resources/mapper/TbMShopUserMapper.xml
+++ b/eladmin-system/src/main/resources/mapper/TbMShopUserMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.ysk.cashier.mybatis.mapper.TbMShopUserMapper">
 
-    <resultMap id="BaseResultMap" type="cn.ysk.cashier.mybatis.entity.TbMShopUser">
+    <resultMap id="BaseResultMap" type="cn.ysk.cashier.mybatis.entity.TbShopUser">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="amount" column="amount" jdbcType="DECIMAL"/>
             <result property="credit_amount" column="credit_amount" jdbcType="DECIMAL"/>