From cbdbe16cd00d5a547437e46056c37eac496c7a4e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 24 Oct 2024 16:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=86=85=E5=AE=B9=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20=E5=85=85=E5=80=BC=E4=BC=9A=E5=91=98=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E8=B5=A0=E9=80=81=20=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayController.java | 5 - .../dao/CodeColumnConfigMapper.java | 17 - .../dao/CodeGenConfigMapper.java | 17 - .../cashierservice/dao/MntAppMapper.java | 17 - .../cashierservice/dao/MntDatabaseMapper.java | 17 - .../dao/MntDeployHistoryMapper.java | 17 - .../cashierservice/dao/MntDeployMapper.java | 17 - .../dao/MntDeployServerMapper.java | 11 - .../cashierservice/dao/MntServerMapper.java | 17 - .../dao/TbActivateInRecordMapper.java | 68 ++ .../cashierservice/dao/TbActivateMapper.java | 65 +- .../dao/TbActivateOutRecordMapper.java | 68 ++ .../dao/TbCouponProductMapper.java | 69 ++ .../dao/TbDeviceOperateInfoMapper.java | 17 - .../dao/TbPlussDeviceGoodsMapper.java | 19 - .../dao/TbReceiptSalesMapper.java | 17 - .../dao/TbRenewalsPayLogMapper.java | 17 - .../dao/TbShopCashSpreadMapper.java | 20 - .../dao/TbShopCouponMapper.java | 68 ++ .../dao/TbShopCurrencyMapper.java | 20 - .../cashierservice/dao/TbShopInfoMapper.java | 14 - .../entity/CodeColumnConfig.java | 147 ---- .../cashierservice/entity/CodeGenConfig.java | 107 --- .../system/cashierservice/entity/MntApp.java | 128 --- .../cashierservice/entity/MntDatabase.java | 98 --- .../cashierservice/entity/MntDeploy.java | 68 -- .../entity/MntDeployHistory.java | 68 -- .../entity/MntDeployServerKey.java | 27 - .../cashierservice/entity/MntServer.java | 108 --- .../cashierservice/entity/TbActivate.java | 101 ++- .../entity/TbActivateInRecord.java | 223 ++++++ .../entity/TbActivateOutRecord.java | 141 ++++ .../entity/TbCouponProduct.java | 83 ++ .../entity/TbDeviceOperateInfo.java | 68 -- .../entity/TbPlussDeviceGoods.java | 128 --- .../cashierservice/entity/TbReceiptSales.java | 207 ----- .../entity/TbRenewalsPayLog.java | 148 ---- .../entity/TbShopCashSpread.java | 37 - .../entity/TbShopCashSpreadWithBLOBs.java | 57 -- .../cashierservice/entity/TbShopCoupon.java | 288 +++++++ .../cashierservice/entity/TbShopCurrency.java | 208 ----- .../entity/TbShopCurrencyWithBLOBs.java | 27 - .../cashierservice/entity/TbShopInfo.java | 274 +++++-- .../cashierservice/service/MemberService.java | 179 +++-- .../service/TbActivateInRecordService.java | 25 + .../task/ShopInfoStatusTask.java | 101 --- .../mapper/CodeColumnConfigMapper.xml | 199 ----- .../resources/mapper/CodeGenConfigMapper.xml | 153 ---- src/main/resources/mapper/MntAppMapper.xml | 177 ----- .../resources/mapper/MntDatabaseMapper.xml | 141 ---- .../mapper/MntDeployHistoryMapper.xml | 106 --- src/main/resources/mapper/MntDeployMapper.xml | 106 --- .../mapper/MntDeployServerMapper.xml | 36 - src/main/resources/mapper/MntServerMapper.xml | 153 ---- .../mapper/TbActivateInRecordMapper.xml | 194 +++++ .../resources/mapper/TbActivateMapper.xml | 250 +++--- .../mapper/TbActivateOutRecordMapper.xml | 140 ++++ .../mapper/TbCouponProductMapper.xml | 109 +++ .../mapper/TbDeviceOperateInfoMapper.xml | 106 --- .../mapper/TbPlussDeviceGoodsMapper.xml | 198 ----- .../resources/mapper/TbReceiptSalesMapper.xml | 271 ------- .../mapper/TbRenewalsPayLogMapper.xml | 199 ----- .../mapper/TbShopCashSpreadMapper.xml | 143 ---- .../resources/mapper/TbShopCouponMapper.xml | 232 ++++++ .../resources/mapper/TbShopCurrencyMapper.xml | 325 -------- .../resources/mapper/TbShopInfoMapper.xml | 729 +++--------------- 66 files changed, 2370 insertions(+), 5240 deletions(-) delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeColumnConfigMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeGenConfigMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntAppMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDatabaseMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployHistoryMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployServerMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/MntServerMapper.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeColumnConfig.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeGenConfig.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntApp.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDatabase.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeploy.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployHistory.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployServerKey.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/MntServer.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java delete mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/task/ShopInfoStatusTask.java delete mode 100644 src/main/resources/mapper/CodeColumnConfigMapper.xml delete mode 100644 src/main/resources/mapper/CodeGenConfigMapper.xml delete mode 100644 src/main/resources/mapper/MntAppMapper.xml delete mode 100644 src/main/resources/mapper/MntDatabaseMapper.xml delete mode 100644 src/main/resources/mapper/MntDeployHistoryMapper.xml delete mode 100644 src/main/resources/mapper/MntDeployMapper.xml delete mode 100644 src/main/resources/mapper/MntDeployServerMapper.xml delete mode 100644 src/main/resources/mapper/MntServerMapper.xml create mode 100644 src/main/resources/mapper/TbActivateInRecordMapper.xml create mode 100644 src/main/resources/mapper/TbActivateOutRecordMapper.xml create mode 100644 src/main/resources/mapper/TbCouponProductMapper.xml delete mode 100644 src/main/resources/mapper/TbDeviceOperateInfoMapper.xml delete mode 100644 src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml delete mode 100644 src/main/resources/mapper/TbReceiptSalesMapper.xml delete mode 100644 src/main/resources/mapper/TbRenewalsPayLogMapper.xml delete mode 100644 src/main/resources/mapper/TbShopCashSpreadMapper.xml create mode 100644 src/main/resources/mapper/TbShopCouponMapper.xml delete mode 100644 src/main/resources/mapper/TbShopCurrencyMapper.xml diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index aa4445f..1d4dfa6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -263,11 +263,6 @@ public class PayController { return payService.returnGroupOrder(param); } - @RequestMapping("test") - @LimitSubmit(key = "testOrder:%s") - public Result testOrder(@RequestParam("orderId") String orderId) { - return Result.success(CodeEnum.SUCCESS); - } @RequestMapping("getOrderDiscount") public Result getOrderDiscount(@RequestHeader("token") String token, diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeColumnConfigMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeColumnConfigMapper.java deleted file mode 100644 index 51d02ad..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeColumnConfigMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.CodeColumnConfig; - -public interface CodeColumnConfigMapper { - int deleteByPrimaryKey(Long columnId); - - int insert(CodeColumnConfig record); - - int insertSelective(CodeColumnConfig record); - - CodeColumnConfig selectByPrimaryKey(Long columnId); - - int updateByPrimaryKeySelective(CodeColumnConfig record); - - int updateByPrimaryKey(CodeColumnConfig record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeGenConfigMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeGenConfigMapper.java deleted file mode 100644 index 2474703..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeGenConfigMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.CodeGenConfig; - -public interface CodeGenConfigMapper { - int deleteByPrimaryKey(Long configId); - - int insert(CodeGenConfig record); - - int insertSelective(CodeGenConfig record); - - CodeGenConfig selectByPrimaryKey(Long configId); - - int updateByPrimaryKeySelective(CodeGenConfig record); - - int updateByPrimaryKey(CodeGenConfig record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntAppMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntAppMapper.java deleted file mode 100644 index 9d90e61..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntAppMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntApp; - -public interface MntAppMapper { - int deleteByPrimaryKey(Long appId); - - int insert(MntApp record); - - int insertSelective(MntApp record); - - MntApp selectByPrimaryKey(Long appId); - - int updateByPrimaryKeySelective(MntApp record); - - int updateByPrimaryKey(MntApp record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDatabaseMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDatabaseMapper.java deleted file mode 100644 index c927c24..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDatabaseMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntDatabase; - -public interface MntDatabaseMapper { - int deleteByPrimaryKey(String dbId); - - int insert(MntDatabase record); - - int insertSelective(MntDatabase record); - - MntDatabase selectByPrimaryKey(String dbId); - - int updateByPrimaryKeySelective(MntDatabase record); - - int updateByPrimaryKey(MntDatabase record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployHistoryMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployHistoryMapper.java deleted file mode 100644 index da8402f..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployHistoryMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntDeployHistory; - -public interface MntDeployHistoryMapper { - int deleteByPrimaryKey(String historyId); - - int insert(MntDeployHistory record); - - int insertSelective(MntDeployHistory record); - - MntDeployHistory selectByPrimaryKey(String historyId); - - int updateByPrimaryKeySelective(MntDeployHistory record); - - int updateByPrimaryKey(MntDeployHistory record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployMapper.java deleted file mode 100644 index 8bb916c..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntDeploy; - -public interface MntDeployMapper { - int deleteByPrimaryKey(Long deployId); - - int insert(MntDeploy record); - - int insertSelective(MntDeploy record); - - MntDeploy selectByPrimaryKey(Long deployId); - - int updateByPrimaryKeySelective(MntDeploy record); - - int updateByPrimaryKey(MntDeploy record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployServerMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployServerMapper.java deleted file mode 100644 index f55230a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployServerMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntDeployServerKey; - -public interface MntDeployServerMapper { - int deleteByPrimaryKey(MntDeployServerKey key); - - int insert(MntDeployServerKey record); - - int insertSelective(MntDeployServerKey record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntServerMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntServerMapper.java deleted file mode 100644 index 71f8043..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/MntServerMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.MntServer; - -public interface MntServerMapper { - int deleteByPrimaryKey(Long serverId); - - int insert(MntServer record); - - int insertSelective(MntServer record); - - MntServer selectByPrimaryKey(Long serverId); - - int updateByPrimaryKeySelective(MntServer record); - - int updateByPrimaryKey(MntServer record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java new file mode 100644 index 0000000..945b156 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateInRecordMapper.java @@ -0,0 +1,68 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbActivateInRecord; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 活动商品赠送记录表(TbActivateInRecord)表数据库访问层 + * + * @author ww + * @since 2024-10-24 15:55:01 + */ +public interface TbActivateInRecordMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbActivateInRecord queryById(Integer id); + + /** + * 查询数据 + * + * @param tbActivateInRecord 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbActivateInRecord tbActivateInRecord, @Param("pageable") Pageable pageable); + + + /** + * 新增数据 + * + * @param tbActivateInRecord 实例对象 + * @return 影响行数 + */ + int insert(TbActivateInRecord tbActivateInRecord); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbActivateInRecord 实例对象 + * @return 影响行数 + */ + int update(TbActivateInRecord tbActivateInRecord); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java index f15259c..6b4436f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateMapper.java @@ -1,27 +1,70 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbActivate; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; +import org.springframework.data.domain.Pageable; import java.math.BigDecimal; +import java.util.List; -@Component -@Mapper +/** + * (TbActivate)表数据库访问层 + * + * @author ww + * @since 2024-10-23 09:57:47 + */ public interface TbActivateMapper { - int deleteByPrimaryKey(Integer id); - int insert(TbActivate record); + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbActivate queryById(Integer id); - int insertSelective(TbActivate record); + /** + * 查询数据 + * + * @param tbActivate 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbActivate tbActivate, @Param("pageable") Pageable pageable); - TbActivate selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(TbActivate record); + /** + * 新增数据 + * + * @param tbActivate 实例对象 + * @return 影响行数 + */ + int insert(TbActivate tbActivate); - int updateByPrimaryKey(TbActivate record); + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + /** + * 修改数据 + * + * @param tbActivate 实例对象 + * @return 影响行数 + */ + int update(TbActivate tbActivate); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); TbActivate selectByAmount(@Param("shopId") String shopId, @Param("amount") BigDecimal amount); -} \ No newline at end of file +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java new file mode 100644 index 0000000..82baf85 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java @@ -0,0 +1,68 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbActivateOutRecord; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 活动赠送商品使用记录表(TbActivateOutRecord)表数据库访问层 + * + * @author ww + * @since 2024-10-24 15:55:23 + */ +public interface TbActivateOutRecordMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbActivateOutRecord queryById(Integer id); + + /** + * 查询数据 + * + * @param tbActivateOutRecord 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbActivateOutRecord tbActivateOutRecord, @Param("pageable") Pageable pageable); + + + /** + * 新增数据 + * + * @param tbActivateOutRecord 实例对象 + * @return 影响行数 + */ + int insert(TbActivateOutRecord tbActivateOutRecord); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbActivateOutRecord 实例对象 + * @return 影响行数 + */ + int update(TbActivateOutRecord tbActivateOutRecord); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java new file mode 100644 index 0000000..cb23d2d --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbCouponProductMapper.java @@ -0,0 +1,69 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbCouponProduct; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 活动赠送商品表(TbCouponProduct)表数据库访问层 + * + * @author ww + * @since 2024-10-24 15:56:08 + */ +public interface TbCouponProductMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbCouponProduct queryById(Integer id); + + /** + * 查询数据 + * + * @param tbCouponProduct 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbCouponProduct tbCouponProduct, @Param("pageable") Pageable pageable); + + List queryAllByCouponId(Integer couponId); + + /** + * 新增数据 + * + * @param tbCouponProduct 实例对象 + * @return 影响行数 + */ + int insert(TbCouponProduct tbCouponProduct); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbCouponProduct 实例对象 + * @return 影响行数 + */ + int update(TbCouponProduct tbCouponProduct); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java deleted file mode 100644 index 38b0c4d..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbDeviceOperateInfo; - -public interface TbDeviceOperateInfoMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbDeviceOperateInfo record); - - int insertSelective(TbDeviceOperateInfo record); - - TbDeviceOperateInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbDeviceOperateInfo record); - - int updateByPrimaryKey(TbDeviceOperateInfo record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java deleted file mode 100644 index c97cc2d..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbPlussDeviceGoods; - -public interface TbPlussDeviceGoodsMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbPlussDeviceGoods record); - - int insertSelective(TbPlussDeviceGoods record); - - TbPlussDeviceGoods selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbPlussDeviceGoods record); - - int updateByPrimaryKeyWithBLOBs(TbPlussDeviceGoods record); - - int updateByPrimaryKey(TbPlussDeviceGoods record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java deleted file mode 100644 index 51af334..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbReceiptSales; - -public interface TbReceiptSalesMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbReceiptSales record); - - int insertSelective(TbReceiptSales record); - - TbReceiptSales selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbReceiptSales record); - - int updateByPrimaryKey(TbReceiptSales record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java deleted file mode 100644 index 0f317e8..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbRenewalsPayLog; - -public interface TbRenewalsPayLogMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbRenewalsPayLog record); - - int insertSelective(TbRenewalsPayLog record); - - TbRenewalsPayLog selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbRenewalsPayLog record); - - int updateByPrimaryKey(TbRenewalsPayLog record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java deleted file mode 100644 index ddcc1bd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbShopCashSpread; -import com.chaozhanggui.system.cashierservice.entity.TbShopCashSpreadWithBLOBs; - -public interface TbShopCashSpreadMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopCashSpreadWithBLOBs record); - - int insertSelective(TbShopCashSpreadWithBLOBs record); - - TbShopCashSpreadWithBLOBs selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbShopCashSpreadWithBLOBs record); - - int updateByPrimaryKeyWithBLOBs(TbShopCashSpreadWithBLOBs record); - - int updateByPrimaryKey(TbShopCashSpread record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java new file mode 100644 index 0000000..1958003 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCouponMapper.java @@ -0,0 +1,68 @@ +package com.chaozhanggui.system.cashierservice.dao; + +import com.chaozhanggui.system.cashierservice.entity.TbShopCoupon; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 优惠券(TbShopCoupon)表数据库访问层 + * + * @author ww + * @since 2024-10-24 15:52:58 + */ +public interface TbShopCouponMapper { + + /** + * 通过ID查询单条数据 + * + * @param id 主键 + * @return 实例对象 + */ + TbShopCoupon queryById(Integer id); + + /** + * 查询数据 + * + * @param tbShopCoupon 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAll(TbShopCoupon tbShopCoupon, @Param("pageable") Pageable pageable); + + + /** + * 新增数据 + * + * @param tbShopCoupon 实例对象 + * @return 影响行数 + */ + int insert(TbShopCoupon tbShopCoupon); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param tbShopCoupon 实例对象 + * @return 影响行数 + */ + int update(TbShopCoupon tbShopCoupon); + + /** + * 通过主键删除数据 + * + * @param id 主键 + * @return 影响行数 + */ + int deleteById(Integer id); + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java deleted file mode 100644 index 8dbcb5b..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chaozhanggui.system.cashierservice.dao; - -import com.chaozhanggui.system.cashierservice.entity.TbShopCurrency; -import com.chaozhanggui.system.cashierservice.entity.TbShopCurrencyWithBLOBs; - -public interface TbShopCurrencyMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopCurrencyWithBLOBs record); - - int insertSelective(TbShopCurrencyWithBLOBs record); - - TbShopCurrencyWithBLOBs selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TbShopCurrencyWithBLOBs record); - - int updateByPrimaryKeyWithBLOBs(TbShopCurrencyWithBLOBs record); - - int updateByPrimaryKey(TbShopCurrency record); -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java index 83ff898..dcff0da 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopInfoMapper.java @@ -1,26 +1,12 @@ package com.chaozhanggui.system.cashierservice.dao; import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Component; import java.util.List; public interface TbShopInfoMapper { - int deleteByPrimaryKey(Integer id); - - int insert(TbShopInfo record); - - int insertSelective(TbShopInfo record); - TbShopInfo selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(TbShopInfo record); - - int updateByPrimaryKeyWithBLOBs(TbShopInfo record); - - int updateByPrimaryKey(TbShopInfo record); - List selectAll(); List selectAllByCreateTime(); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeColumnConfig.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeColumnConfig.java deleted file mode 100644 index f1a0b5e..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeColumnConfig.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class CodeColumnConfig implements Serializable { - private Long columnId; - - private String tableName; - - private String columnName; - - private String columnType; - - private String dictName; - - private String extra; - - private Boolean formShow; - - private String formType; - - private String keyType; - - private Boolean listShow; - - private Boolean notNull; - - private String queryType; - - private String remark; - - private String dateAnnotation; - - private static final long serialVersionUID = 1L; - - public Long getColumnId() { - return columnId; - } - - public void setColumnId(Long columnId) { - this.columnId = columnId; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName == null ? null : tableName.trim(); - } - - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName == null ? null : columnName.trim(); - } - - public String getColumnType() { - return columnType; - } - - public void setColumnType(String columnType) { - this.columnType = columnType == null ? null : columnType.trim(); - } - - public String getDictName() { - return dictName; - } - - public void setDictName(String dictName) { - this.dictName = dictName == null ? null : dictName.trim(); - } - - public String getExtra() { - return extra; - } - - public void setExtra(String extra) { - this.extra = extra == null ? null : extra.trim(); - } - - public Boolean getFormShow() { - return formShow; - } - - public void setFormShow(Boolean formShow) { - this.formShow = formShow; - } - - public String getFormType() { - return formType; - } - - public void setFormType(String formType) { - this.formType = formType == null ? null : formType.trim(); - } - - public String getKeyType() { - return keyType; - } - - public void setKeyType(String keyType) { - this.keyType = keyType == null ? null : keyType.trim(); - } - - public Boolean getListShow() { - return listShow; - } - - public void setListShow(Boolean listShow) { - this.listShow = listShow; - } - - public Boolean getNotNull() { - return notNull; - } - - public void setNotNull(Boolean notNull) { - this.notNull = notNull; - } - - public String getQueryType() { - return queryType; - } - - public void setQueryType(String queryType) { - this.queryType = queryType == null ? null : queryType.trim(); - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public String getDateAnnotation() { - return dateAnnotation; - } - - public void setDateAnnotation(String dateAnnotation) { - this.dateAnnotation = dateAnnotation == null ? null : dateAnnotation.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeGenConfig.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeGenConfig.java deleted file mode 100644 index b9d1541..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeGenConfig.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class CodeGenConfig implements Serializable { - private Long configId; - - private String tableName; - - private String author; - - private Boolean cover; - - private String moduleName; - - private String pack; - - private String path; - - private String apiPath; - - private String prefix; - - private String apiAlias; - - private static final long serialVersionUID = 1L; - - public Long getConfigId() { - return configId; - } - - public void setConfigId(Long configId) { - this.configId = configId; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName == null ? null : tableName.trim(); - } - - public String getAuthor() { - return author; - } - - public void setAuthor(String author) { - this.author = author == null ? null : author.trim(); - } - - public Boolean getCover() { - return cover; - } - - public void setCover(Boolean cover) { - this.cover = cover; - } - - public String getModuleName() { - return moduleName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName == null ? null : moduleName.trim(); - } - - public String getPack() { - return pack; - } - - public void setPack(String pack) { - this.pack = pack == null ? null : pack.trim(); - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path == null ? null : path.trim(); - } - - public String getApiPath() { - return apiPath; - } - - public void setApiPath(String apiPath) { - this.apiPath = apiPath == null ? null : apiPath.trim(); - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix == null ? null : prefix.trim(); - } - - public String getApiAlias() { - return apiAlias; - } - - public void setApiAlias(String apiAlias) { - this.apiAlias = apiAlias == null ? null : apiAlias.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntApp.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntApp.java deleted file mode 100644 index e6aff27..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntApp.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class MntApp implements Serializable { - private Long appId; - - private String name; - - private String uploadPath; - - private String deployPath; - - private String backupPath; - - private Integer port; - - private String startScript; - - private String deployScript; - - private String createBy; - - private String updateBy; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public Long getAppId() { - return appId; - } - - public void setAppId(Long appId) { - this.appId = appId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getUploadPath() { - return uploadPath; - } - - public void setUploadPath(String uploadPath) { - this.uploadPath = uploadPath == null ? null : uploadPath.trim(); - } - - public String getDeployPath() { - return deployPath; - } - - public void setDeployPath(String deployPath) { - this.deployPath = deployPath == null ? null : deployPath.trim(); - } - - public String getBackupPath() { - return backupPath; - } - - public void setBackupPath(String backupPath) { - this.backupPath = backupPath == null ? null : backupPath.trim(); - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public String getStartScript() { - return startScript; - } - - public void setStartScript(String startScript) { - this.startScript = startScript == null ? null : startScript.trim(); - } - - public String getDeployScript() { - return deployScript; - } - - public void setDeployScript(String deployScript) { - this.deployScript = deployScript == null ? null : deployScript.trim(); - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy == null ? null : createBy.trim(); - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy == null ? null : updateBy.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDatabase.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDatabase.java deleted file mode 100644 index f6ab7d4..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDatabase.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class MntDatabase implements Serializable { - private String dbId; - - private String name; - - private String jdbcUrl; - - private String userName; - - private String pwd; - - private String createBy; - - private String updateBy; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public String getDbId() { - return dbId; - } - - public void setDbId(String dbId) { - this.dbId = dbId == null ? null : dbId.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getJdbcUrl() { - return jdbcUrl; - } - - public void setJdbcUrl(String jdbcUrl) { - this.jdbcUrl = jdbcUrl == null ? null : jdbcUrl.trim(); - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName == null ? null : userName.trim(); - } - - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd == null ? null : pwd.trim(); - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy == null ? null : createBy.trim(); - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy == null ? null : updateBy.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeploy.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeploy.java deleted file mode 100644 index 12ed97c..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeploy.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class MntDeploy implements Serializable { - private Long deployId; - - private Long appId; - - private String createBy; - - private String updateBy; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public Long getDeployId() { - return deployId; - } - - public void setDeployId(Long deployId) { - this.deployId = deployId; - } - - public Long getAppId() { - return appId; - } - - public void setAppId(Long appId) { - this.appId = appId; - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy == null ? null : createBy.trim(); - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy == null ? null : updateBy.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployHistory.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployHistory.java deleted file mode 100644 index 1a53488..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployHistory.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class MntDeployHistory implements Serializable { - private String historyId; - - private String appName; - - private Date deployDate; - - private String deployUser; - - private String ip; - - private Long deployId; - - private static final long serialVersionUID = 1L; - - public String getHistoryId() { - return historyId; - } - - public void setHistoryId(String historyId) { - this.historyId = historyId == null ? null : historyId.trim(); - } - - public String getAppName() { - return appName; - } - - public void setAppName(String appName) { - this.appName = appName == null ? null : appName.trim(); - } - - public Date getDeployDate() { - return deployDate; - } - - public void setDeployDate(Date deployDate) { - this.deployDate = deployDate; - } - - public String getDeployUser() { - return deployUser; - } - - public void setDeployUser(String deployUser) { - this.deployUser = deployUser == null ? null : deployUser.trim(); - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip == null ? null : ip.trim(); - } - - public Long getDeployId() { - return deployId; - } - - public void setDeployId(Long deployId) { - this.deployId = deployId; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployServerKey.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployServerKey.java deleted file mode 100644 index 7965263..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployServerKey.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class MntDeployServerKey implements Serializable { - private Long deployId; - - private Long serverId; - - private static final long serialVersionUID = 1L; - - public Long getDeployId() { - return deployId; - } - - public void setDeployId(Long deployId) { - this.deployId = deployId; - } - - public Long getServerId() { - return serverId; - } - - public void setServerId(Long serverId) { - this.serverId = serverId; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntServer.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntServer.java deleted file mode 100644 index 6b832a0..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/MntServer.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class MntServer implements Serializable { - private Long serverId; - - private String account; - - private String ip; - - private String name; - - private String password; - - private Integer port; - - private String createBy; - - private String updateBy; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - - public Long getServerId() { - return serverId; - } - - public void setServerId(Long serverId) { - this.serverId = serverId; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account == null ? null : account.trim(); - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip == null ? null : ip.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); - } - - public Integer getPort() { - return port; - } - - public void setPort(Integer port) { - this.port = port; - } - - public String getCreateBy() { - return createBy; - } - - public void setCreateBy(String createBy) { - this.createBy = createBy == null ? null : createBy.trim(); - } - - public String getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(String updateBy) { - this.updateBy = updateBy == null ? null : updateBy.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java index c223bfc..ede3af1 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java @@ -1,24 +1,45 @@ package com.chaozhanggui.system.cashierservice.entity; +import java.util.Date; import java.io.Serializable; -import java.math.BigDecimal; +/** + * (TbActivate)实体类 + * + * @author ww + * @since 2024-10-23 09:57:13 + */ public class TbActivate implements Serializable { + private static final long serialVersionUID = -45208765530510891L; + private Integer id; private Integer shopId; + /** + * 充值金额 + */ + private Integer amount; + /** + * 赠送金额 + */ + private Integer giftAmount; + /** + * 是否使用优惠卷 0否 1是 + */ + private Integer isUseCoupon; + /** + * 优惠卷id + */ + private Integer couponId; + /** + * 优惠卷数量 + */ + private Integer num; - private Integer minNum; + private Date createTime; - private Integer maxNum; + private Date updateTime; - private BigDecimal handselNum; - - private String handselType; - - private String isDel; - - private static final long serialVersionUID = 1L; public Integer getId() { return id; @@ -36,43 +57,61 @@ public class TbActivate implements Serializable { this.shopId = shopId; } - public Integer getMinNum() { - return minNum; + public Integer getAmount() { + return amount; } - public void setMinNum(Integer minNum) { - this.minNum = minNum; + public void setAmount(Integer amount) { + this.amount = amount; } - public Integer getMaxNum() { - return maxNum; + public Integer getGiftAmount() { + return giftAmount; } - public void setMaxNum(Integer maxNum) { - this.maxNum = maxNum; + public void setGiftAmount(Integer giftAmount) { + this.giftAmount = giftAmount; } - public BigDecimal getHandselNum() { - return handselNum; + public Integer getIsUseCoupon() { + return isUseCoupon; } - public void setHandselNum(BigDecimal handselNum) { - this.handselNum = handselNum; + public void setIsUseCoupon(Integer isUseCoupon) { + this.isUseCoupon = isUseCoupon; } - public String getHandselType() { - return handselType; + public Integer getCouponId() { + return couponId; } - public void setHandselType(String handselType) { - this.handselType = handselType == null ? null : handselType.trim(); + public void setCouponId(Integer couponId) { + this.couponId = couponId; } - public String getIsDel() { - return isDel; + public Integer getNum() { + return num; } - public void setIsDel(String isDel) { - this.isDel = isDel == null ? null : isDel.trim(); + public void setNum(Integer num) { + this.num = num; } -} \ No newline at end of file + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java new file mode 100644 index 0000000..644c179 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java @@ -0,0 +1,223 @@ +package com.chaozhanggui.system.cashierservice.entity; + +import java.util.Date; +import java.io.Serializable; + +/** + * 活动商品赠送记录表(TbActivateInRecord)实体类 + * + * @author ww + * @since 2024-10-24 15:55:01 + */ +public class TbActivateInRecord implements Serializable { + private static final long serialVersionUID = -87516247063601097L; + + private Integer id; + /** + * 会员id + */ + private Integer vipUserId; + /** + * 卷Id (校验是否可用) + */ + private Integer couponId; + /** + * 卷描述 满10减2/商品卷 + */ + private String name; + /** + * 1-满减 2-商品 + */ + private Integer type; + /** + * 商品id + */ + private Integer proId; + /** + * 满多少金额 + */ + private Integer fullAmount; + /** + * 减多少金额 + */ + private Integer discountAmount; + /** + * 赠送数量 + */ + private Integer num; + /** + * 未使用数量 + */ + private Integer overNum; + /** + * 店铺id + */ + private Integer shopId; + /** + * 来源活动id + */ + private Integer sourceActId; + + private Integer sourceFlowId; + /** + * 可用开始时间 + */ + private Date useStartTime; + /** + * 可用结束时间 + */ + private Date useEndTime; + + private Date createTime; + + private Date updateTime; + + private String couponJson; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getVipUserId() { + return vipUserId; + } + + public void setVipUserId(Integer vipUserId) { + this.vipUserId = vipUserId; + } + + public Integer getCouponId() { + return couponId; + } + + public void setCouponId(Integer couponId) { + this.couponId = couponId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getProId() { + return proId; + } + + public void setProId(Integer proId) { + this.proId = proId; + } + + public Integer getFullAmount() { + return fullAmount; + } + + public void setFullAmount(Integer fullAmount) { + this.fullAmount = fullAmount; + } + + public Integer getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(Integer discountAmount) { + this.discountAmount = discountAmount; + } + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } + + public Integer getOverNum() { + return overNum; + } + + public void setOverNum(Integer overNum) { + this.overNum = overNum; + } + + public Integer getShopId() { + return shopId; + } + + public void setShopId(Integer shopId) { + this.shopId = shopId; + } + + public Integer getSourceActId() { + return sourceActId; + } + + public void setSourceActId(Integer sourceActId) { + this.sourceActId = sourceActId; + } + + public Integer getSourceFlowId() { + return sourceFlowId; + } + + public void setSourceFlowId(Integer sourceFlowId) { + this.sourceFlowId = sourceFlowId; + } + + public Date getUseStartTime() { + return useStartTime; + } + + public void setUseStartTime(Date useStartTime) { + this.useStartTime = useStartTime; + } + + public Date getUseEndTime() { + return useEndTime; + } + + public void setUseEndTime(Date useEndTime) { + this.useEndTime = useEndTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getCouponJson() { + return couponJson; + } + + public void setCouponJson(String couponJson) { + this.couponJson = couponJson; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java new file mode 100644 index 0000000..646260c --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java @@ -0,0 +1,141 @@ +package com.chaozhanggui.system.cashierservice.entity; + +import java.util.Date; +import java.io.Serializable; + +/** + * 活动赠送商品使用记录表(TbActivateOutRecord)实体类 + * + * @author ww + * @since 2024-10-24 15:55:23 + */ +public class TbActivateOutRecord implements Serializable { + private static final long serialVersionUID = -14744224643993479L; + + private Integer id; + + private Integer shopId; + /** + * 订单id + */ + private String orderId; + /** + * 商品赠送Id tb_activate_in_record的id + */ + private Integer giveId; + /** + * 会员id + */ + private Integer vipUserId; + /** + * 1-满减 2-商品 + */ + private Integer type; + /** + * 使用数量 + */ + private Integer useNum; + /** + * 退单量 + */ + private Integer refNum; + /** + * 新建： create， 完成： closed, 取消：cancel, + */ + private String status; + + private Date createTime; + + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getShopId() { + return shopId; + } + + public void setShopId(Integer shopId) { + this.shopId = shopId; + } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public Integer getGiveId() { + return giveId; + } + + public void setGiveId(Integer giveId) { + this.giveId = giveId; + } + + public Integer getVipUserId() { + return vipUserId; + } + + public void setVipUserId(Integer vipUserId) { + this.vipUserId = vipUserId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getUseNum() { + return useNum; + } + + public void setUseNum(Integer useNum) { + this.useNum = useNum; + } + + public Integer getRefNum() { + return refNum; + } + + public void setRefNum(Integer refNum) { + this.refNum = refNum; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java new file mode 100644 index 0000000..223ecf2 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCouponProduct.java @@ -0,0 +1,83 @@ +package com.chaozhanggui.system.cashierservice.entity; + +import java.util.Date; +import java.io.Serializable; + +/** + * 活动赠送商品表(TbCouponProduct)实体类 + * + * @author ww + * @since 2024-10-24 15:56:09 + */ +public class TbCouponProduct implements Serializable { + private static final long serialVersionUID = 685322089212281310L; + + private Integer id; + /** + * 活动Id + */ + private Integer couponId; + /** + * 商品id + */ + private Integer productId; + /** + * 数量 + */ + private Integer num; + + private Date createTime; + + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getCouponId() { + return couponId; + } + + public void setCouponId(Integer couponId) { + this.couponId = couponId; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java deleted file mode 100644 index e6c8e56..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class TbDeviceOperateInfo implements Serializable { - private Integer id; - - private String deviceno; - - private String type; - - private String shopId; - - private Date createtime; - - private String remark; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getDeviceno() { - return deviceno; - } - - public void setDeviceno(String deviceno) { - this.deviceno = deviceno == null ? null : deviceno.trim(); - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type == null ? null : type.trim(); - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java deleted file mode 100644 index d3132cc..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.util.Date; - -public class TbPlussDeviceGoods implements Serializable { - private Integer id; - - private String code; - - private String name; - - private String devicelogo; - - private String introdesc; - - private Integer sort; - - private Integer status; - - private Integer tagid; - - private String depositflag; - - private Date createtime; - - private Date updatetime; - - private String detail; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code == null ? null : code.trim(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getDevicelogo() { - return devicelogo; - } - - public void setDevicelogo(String devicelogo) { - this.devicelogo = devicelogo == null ? null : devicelogo.trim(); - } - - public String getIntrodesc() { - return introdesc; - } - - public void setIntrodesc(String introdesc) { - this.introdesc = introdesc == null ? null : introdesc.trim(); - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Integer getTagid() { - return tagid; - } - - public void setTagid(Integer tagid) { - this.tagid = tagid; - } - - public String getDepositflag() { - return depositflag; - } - - public void setDepositflag(String depositflag) { - this.depositflag = depositflag == null ? null : depositflag.trim(); - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public String getDetail() { - return detail; - } - - public void setDetail(String detail) { - this.detail = detail == null ? null : detail.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java deleted file mode 100644 index 1a38a26..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbReceiptSales implements Serializable { - private Integer id; - - private String title; - - private String logo; - - private Boolean showContactInfo; - - private Boolean showMember; - - private Boolean showMemberCode; - - private Boolean showMemberScore; - - private Boolean showMemberWallet; - - private String footerRemark; - - private Boolean showCashCharge; - - private Boolean showSerialNo; - - private Boolean bigSerialNo; - - private String headerText; - - private String headerTextAlign; - - private String footerText; - - private String footerTextAlign; - - private String footerImage; - - private String prePrint; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title == null ? null : title.trim(); - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo == null ? null : logo.trim(); - } - - public Boolean getShowContactInfo() { - return showContactInfo; - } - - public void setShowContactInfo(Boolean showContactInfo) { - this.showContactInfo = showContactInfo; - } - - public Boolean getShowMember() { - return showMember; - } - - public void setShowMember(Boolean showMember) { - this.showMember = showMember; - } - - public Boolean getShowMemberCode() { - return showMemberCode; - } - - public void setShowMemberCode(Boolean showMemberCode) { - this.showMemberCode = showMemberCode; - } - - public Boolean getShowMemberScore() { - return showMemberScore; - } - - public void setShowMemberScore(Boolean showMemberScore) { - this.showMemberScore = showMemberScore; - } - - public Boolean getShowMemberWallet() { - return showMemberWallet; - } - - public void setShowMemberWallet(Boolean showMemberWallet) { - this.showMemberWallet = showMemberWallet; - } - - public String getFooterRemark() { - return footerRemark; - } - - public void setFooterRemark(String footerRemark) { - this.footerRemark = footerRemark == null ? null : footerRemark.trim(); - } - - public Boolean getShowCashCharge() { - return showCashCharge; - } - - public void setShowCashCharge(Boolean showCashCharge) { - this.showCashCharge = showCashCharge; - } - - public Boolean getShowSerialNo() { - return showSerialNo; - } - - public void setShowSerialNo(Boolean showSerialNo) { - this.showSerialNo = showSerialNo; - } - - public Boolean getBigSerialNo() { - return bigSerialNo; - } - - public void setBigSerialNo(Boolean bigSerialNo) { - this.bigSerialNo = bigSerialNo; - } - - public String getHeaderText() { - return headerText; - } - - public void setHeaderText(String headerText) { - this.headerText = headerText == null ? null : headerText.trim(); - } - - public String getHeaderTextAlign() { - return headerTextAlign; - } - - public void setHeaderTextAlign(String headerTextAlign) { - this.headerTextAlign = headerTextAlign == null ? null : headerTextAlign.trim(); - } - - public String getFooterText() { - return footerText; - } - - public void setFooterText(String footerText) { - this.footerText = footerText == null ? null : footerText.trim(); - } - - public String getFooterTextAlign() { - return footerTextAlign; - } - - public void setFooterTextAlign(String footerTextAlign) { - this.footerTextAlign = footerTextAlign == null ? null : footerTextAlign.trim(); - } - - public String getFooterImage() { - return footerImage; - } - - public void setFooterImage(String footerImage) { - this.footerImage = footerImage == null ? null : footerImage.trim(); - } - - public String getPrePrint() { - return prePrint; - } - - public void setPrePrint(String prePrint) { - this.prePrint = prePrint == null ? null : prePrint.trim(); - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java deleted file mode 100644 index 9a4bcbd..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class TbRenewalsPayLog implements Serializable { - private Integer id; - - private String payType; - - private String shopId; - - private String orderId; - - private String openId; - - private String userId; - - private String transactionId; - - private BigDecimal amount; - - private Byte status; - - private String remark; - - private String attach; - - private Long expiredAt; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getPayType() { - return payType; - } - - public void setPayType(String payType) { - this.payType = payType == null ? null : payType.trim(); - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId == null ? null : orderId.trim(); - } - - public String getOpenId() { - return openId; - } - - public void setOpenId(String openId) { - this.openId = openId == null ? null : openId.trim(); - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId == null ? null : userId.trim(); - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId == null ? null : transactionId.trim(); - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - - public Byte getStatus() { - return status; - } - - public void setStatus(Byte status) { - this.status = status; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark == null ? null : remark.trim(); - } - - public String getAttach() { - return attach; - } - - public void setAttach(String attach) { - this.attach = attach == null ? null : attach.trim(); - } - - public Long getExpiredAt() { - return expiredAt; - } - - public void setExpiredAt(Long expiredAt) { - this.expiredAt = expiredAt; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java deleted file mode 100644 index 1a6d486..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCashSpread implements Serializable { - private Integer id; - - private Long createdAt; - - private Long updatedAt; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java deleted file mode 100644 index ac6cc8a..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCashSpreadWithBLOBs extends TbShopCashSpread implements Serializable { - private String saleReceipt; - - private String triplicateReceipt; - - private String screenConfig; - - private String tagConfig; - - private String scaleConfig; - - private static final long serialVersionUID = 1L; - - public String getSaleReceipt() { - return saleReceipt; - } - - public void setSaleReceipt(String saleReceipt) { - this.saleReceipt = saleReceipt == null ? null : saleReceipt.trim(); - } - - public String getTriplicateReceipt() { - return triplicateReceipt; - } - - public void setTriplicateReceipt(String triplicateReceipt) { - this.triplicateReceipt = triplicateReceipt == null ? null : triplicateReceipt.trim(); - } - - public String getScreenConfig() { - return screenConfig; - } - - public void setScreenConfig(String screenConfig) { - this.screenConfig = screenConfig == null ? null : screenConfig.trim(); - } - - public String getTagConfig() { - return tagConfig; - } - - public void setTagConfig(String tagConfig) { - this.tagConfig = tagConfig == null ? null : tagConfig.trim(); - } - - public String getScaleConfig() { - return scaleConfig; - } - - public void setScaleConfig(String scaleConfig) { - this.scaleConfig = scaleConfig == null ? null : scaleConfig.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java new file mode 100644 index 0000000..d95c872 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCoupon.java @@ -0,0 +1,288 @@ +package com.chaozhanggui.system.cashierservice.entity; + +import java.time.LocalTime; +import java.util.Date; +import java.io.Serializable; + +/** + * 优惠券(TbShopCoupon)实体类 + * + * @author ww + * @since 2024-10-24 15:52:58 + */ +public class TbShopCoupon implements Serializable { + private static final long serialVersionUID = -97269009590588062L; + /** + * 自增 + */ + private Integer id; + + private String shopId; + /** + * 名称(无意义) + */ + private String title; + /** + * 1-满减 2-商品 + */ + private Integer type; + /** + * 满多少金额 + */ + private Integer fullAmount; + /** + * 减多少金额 + */ + private Integer discountAmount; + /** + * 描述 + */ + private String description; + /** + * 发放数量 + */ + private Integer number; + /** + * 剩余数量 + */ + private Integer leftNumber; + /** + * 有效期类型，可选值为 fixed（固定时间）/custom（自定义时间） + */ + private String validityType; + /** + * 有效天数 + */ + private Integer validDays; + /** + * 隔多少天生效 + */ + private Integer daysToTakeEffect; + /** + * 有效开始时间 + */ + private Date validStartTime; + /** + * 有效结束时间 + */ + private Date validEndTime; + /** + * 周 数组["周一","周二"] + */ + private String userDays; + /** + * all-全时段 custom-指定时段 + */ + private String useTimeType; + /** + * 可用开始时间 + */ + private LocalTime useStartTime; + /** + * 可用结束时间 + */ + private LocalTime useEndTime; + /** + * 已使用数量 + */ + private Integer useNumber; + /** + * 发放人 + */ + private String editor; + /** + * 状态0-关闭 1 正常 + */ + private Integer status; + + private Date createTime; + + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getFullAmount() { + return fullAmount; + } + + public void setFullAmount(Integer fullAmount) { + this.fullAmount = fullAmount; + } + + public Integer getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(Integer discountAmount) { + this.discountAmount = discountAmount; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getLeftNumber() { + return leftNumber; + } + + public void setLeftNumber(Integer leftNumber) { + this.leftNumber = leftNumber; + } + + public String getValidityType() { + return validityType; + } + + public void setValidityType(String validityType) { + this.validityType = validityType; + } + + public Integer getValidDays() { + return validDays; + } + + public void setValidDays(Integer validDays) { + this.validDays = validDays; + } + + public Integer getDaysToTakeEffect() { + return daysToTakeEffect; + } + + public void setDaysToTakeEffect(Integer daysToTakeEffect) { + this.daysToTakeEffect = daysToTakeEffect; + } + + public Date getValidStartTime() { + return validStartTime; + } + + public void setValidStartTime(Date validStartTime) { + this.validStartTime = validStartTime; + } + + public Date getValidEndTime() { + return validEndTime; + } + + public void setValidEndTime(Date validEndTime) { + this.validEndTime = validEndTime; + } + + public String getUserDays() { + return userDays; + } + + public void setUserDays(String userDays) { + this.userDays = userDays; + } + + public String getUseTimeType() { + return useTimeType; + } + + public void setUseTimeType(String useTimeType) { + this.useTimeType = useTimeType; + } + + public LocalTime getUseStartTime() { + return useStartTime; + } + + public void setUseStartTime(LocalTime useStartTime) { + this.useStartTime = useStartTime; + } + + public LocalTime getUseEndTime() { + return useEndTime; + } + + public void setUseEndTime(LocalTime useEndTime) { + this.useEndTime = useEndTime; + } + + public Integer getUseNumber() { + return useNumber; + } + + public void setUseNumber(Integer useNumber) { + this.useNumber = useNumber; + } + + public String getEditor() { + return editor; + } + + public void setEditor(String editor) { + this.editor = editor; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java deleted file mode 100644 index 4b71c95..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; -import java.math.BigDecimal; - -public class TbShopCurrency implements Serializable { - private Integer id; - - private String shopId; - - private BigDecimal prepareAmount; - - private String currency; - - private Byte decimalsDigits; - - private String discountRound; - - private String merchantId; - - private Byte smallChange; - - private Byte enableCustomDiscount; - - private BigDecimal maxDiscount; - - private Double maxPercent; - - private String bizDuration; - - private Byte allowWebPay; - - private Byte isAutoToZero; - - private Byte isIncludeTaxPrice; - - private String taxNumber; - - private Long createdAt; - - private Long updatedAt; - - private Byte autoLockScreen; - - private Byte voiceNotification; - - private static final long serialVersionUID = 1L; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId == null ? null : shopId.trim(); - } - - public BigDecimal getPrepareAmount() { - return prepareAmount; - } - - public void setPrepareAmount(BigDecimal prepareAmount) { - this.prepareAmount = prepareAmount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency == null ? null : currency.trim(); - } - - public Byte getDecimalsDigits() { - return decimalsDigits; - } - - public void setDecimalsDigits(Byte decimalsDigits) { - this.decimalsDigits = decimalsDigits; - } - - public String getDiscountRound() { - return discountRound; - } - - public void setDiscountRound(String discountRound) { - this.discountRound = discountRound == null ? null : discountRound.trim(); - } - - public String getMerchantId() { - return merchantId; - } - - public void setMerchantId(String merchantId) { - this.merchantId = merchantId == null ? null : merchantId.trim(); - } - - public Byte getSmallChange() { - return smallChange; - } - - public void setSmallChange(Byte smallChange) { - this.smallChange = smallChange; - } - - public Byte getEnableCustomDiscount() { - return enableCustomDiscount; - } - - public void setEnableCustomDiscount(Byte enableCustomDiscount) { - this.enableCustomDiscount = enableCustomDiscount; - } - - public BigDecimal getMaxDiscount() { - return maxDiscount; - } - - public void setMaxDiscount(BigDecimal maxDiscount) { - this.maxDiscount = maxDiscount; - } - - public Double getMaxPercent() { - return maxPercent; - } - - public void setMaxPercent(Double maxPercent) { - this.maxPercent = maxPercent; - } - - public String getBizDuration() { - return bizDuration; - } - - public void setBizDuration(String bizDuration) { - this.bizDuration = bizDuration == null ? null : bizDuration.trim(); - } - - public Byte getAllowWebPay() { - return allowWebPay; - } - - public void setAllowWebPay(Byte allowWebPay) { - this.allowWebPay = allowWebPay; - } - - public Byte getIsAutoToZero() { - return isAutoToZero; - } - - public void setIsAutoToZero(Byte isAutoToZero) { - this.isAutoToZero = isAutoToZero; - } - - public Byte getIsIncludeTaxPrice() { - return isIncludeTaxPrice; - } - - public void setIsIncludeTaxPrice(Byte isIncludeTaxPrice) { - this.isIncludeTaxPrice = isIncludeTaxPrice; - } - - public String getTaxNumber() { - return taxNumber; - } - - public void setTaxNumber(String taxNumber) { - this.taxNumber = taxNumber == null ? null : taxNumber.trim(); - } - - public Long getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Long createdAt) { - this.createdAt = createdAt; - } - - public Long getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Long updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getAutoLockScreen() { - return autoLockScreen; - } - - public void setAutoLockScreen(Byte autoLockScreen) { - this.autoLockScreen = autoLockScreen; - } - - public Byte getVoiceNotification() { - return voiceNotification; - } - - public void setVoiceNotification(Byte voiceNotification) { - this.voiceNotification = voiceNotification; - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java deleted file mode 100644 index 5fc056b..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chaozhanggui.system.cashierservice.entity; - -import java.io.Serializable; - -public class TbShopCurrencyWithBLOBs extends TbShopCurrency implements Serializable { - private String discountConfigs; - - private String serviceCharge; - - private static final long serialVersionUID = 1L; - - public String getDiscountConfigs() { - return discountConfigs; - } - - public void setDiscountConfigs(String discountConfigs) { - this.discountConfigs = discountConfigs == null ? null : discountConfigs.trim(); - } - - public String getServiceCharge() { - return serviceCharge; - } - - public void setServiceCharge(String serviceCharge) { - this.serviceCharge = serviceCharge == null ? null : serviceCharge.trim(); - } -} \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java index 081fedc..a48b85b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java @@ -2,125 +2,265 @@ package com.chaozhanggui.system.cashierservice.entity; import lombok.Data; -import java.io.Serializable; import java.math.BigDecimal; +import java.io.Serializable; +/** + * (TbShopInfo)实体类 + * + * @author ww + * @since 2024-10-24 16:42:26 + */ @Data public class TbShopInfo implements Serializable { + private static final long serialVersionUID = 561716476024545414L; + /** + * 自增id + */ private Integer id; - + /** + * 店铺帐号 + */ private String account; - + /** + * 店铺代号，策略方式为city +店铺号（8位） + */ private String shopCode; - + /** + * 店铺口号 + */ private String subTitle; - + /** + * 商户Id + */ private String merchantId; - + /** + * 店铺名称 + */ private String shopName; - + /** + * 连锁店扩展店名 + */ private String chainName; - + /** + * 背景图 + */ private String backImg; - + /** + * 门头照 + */ private String frontImg; - + /** + * 联系人姓名 + */ private String contactName; - + /** + * 联系电话 + */ private String phone; - + /** + * 店铺log0 + */ private String logo; - - private Byte isDeposit; - - private Byte isSupply; - + /** + * 是否参与代收 0--不参与 1参与 + */ + private Integer isDeposit; + /** + * 是否为供应商 + */ + private Integer isSupply; + /** + * 封面图 + */ private String coverImg; - + /** + * 店铺分享图 + */ private String shareImg; - + /** + * 轮播图 + */ + private String view; + /** + * 店铺简介 + */ private String detail; - + /** + * 经纬度 + */ private String lat; - + /** + * 经纬度 + */ private String lng; - + /** + * 未用 + */ private String mchId; private String registerType; - - private Byte isWxMaIndependent; - + /** + * 是否独立的微信小程序 + */ + private Integer isWxMaIndependent; + /** + * 详细地址 + */ private String address; - + /** + * 类似于这种规则51.51.570 + */ private String city; - + /** + * 店铺类型 超市--MARKET---其它店SHOP + */ private String type; - + /** + * 行业 + */ private String industry; - + /** + * 行业名称 + */ private String industryName; - + /** + * 营业时间(周开始) + */ + private String businessStartDay; + /** + * 营业时间(周结束) + */ + private String businessEndDay; + /** + * 营业时间 + */ private String businessTime; - + /** + * 配送时间 + */ private String postTime; private BigDecimal postAmountLine; - - private Byte onSale; - - private Byte settleType; - + /** + * 0停业1，正常营业,网上售卖 + */ + private Integer onSale; + /** + * 0今日，1次日 + */ + private Integer settleType; + /** + * 时间 + */ private String settleTime; - + /** + * 入驻时间 + */ private Integer enterAt; - + /** + * 到期时间 + */ private Long expireAt; - - private Byte status; - - private Float average; - + /** + * -1 平台禁用 0-过期，1正式营业， + */ + private Integer status; + /** + * 人均消费 + */ + private BigDecimal average; + /** + * 订单等待时间 + */ private Integer orderWaitPayMinute; - + /** + * 支持登陆设备个数 + */ private Integer supportDeviceNumber; - - private Byte distributeLevel; + /** + * 分销层级（1-下级分销 2-两下级分销） + */ + private Integer distributeLevel; private Long createdAt; private Long updatedAt; private String proxyId; + /** + * trial试用版，release正式 + */ + private String profiles; + /** + * 商家二维码 + */ + private String shopQrcode; + /** + * 商家标签 + */ + private String tag; - private String view; - - - + private String isOpenYhq; + /** + * 0否1是 + */ + private Integer isUseVip; + /** + * 省 + */ + private String provinces; + /** + * 市 + */ + private String cities; + /** + * 区/县 + */ + private String districts; + /** + * 是否允许会员自定义金额 1 允许 0 不允许 + */ private String isCustom; - - + /** + * 是否开启退款密码 1 启用 0 禁用 + */ private String isReturn; - - + /** + * 是否开启会员充值密码 1 启用 0 禁用 + */ private String isMemberIn; - - + /** + * 是否开启会员退款密码 1 启用 0 禁用 + */ private String isMemberReturn; - - //是否开启桌位费 0否1是 + /** + * 是否免除桌位费 0否1是 + */ private Integer isTableFee; - //桌位费 + /** + * 是否启用会员价 0否1是 + */ + private Integer isMemberPrice; + /** + * 积分群体 all-所有 vip-仅针对会员 + */ + private String consumeColony; + /** + * 桌位费 + */ private BigDecimal tableFee; - //就餐模式 堂食 dine-in 外带 take-out + /** + * 就餐模式 堂食 dine-in 外带 take-out + */ private String eatModel; - //程序码(零点八零首页) + /** + * 小程序码(零点八零首页) + */ private String smallQrcode; - //店铺收款码 + /** + * 店铺收款码 + */ private String paymentQrcode; - - - private static final long serialVersionUID = 1L; - - } + diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 78cd912..1ec4bbd 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.cashierservice.service; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONObject; @@ -28,12 +29,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; +import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; @Service @@ -68,6 +67,15 @@ public class MemberService { RestTemplate restTemplate; @Autowired TbActivateMapper tbActivateMapper; + + @Autowired + TbShopCouponMapper couponMapper; + @Autowired + TbActivateInRecordMapper activateInRecordMapper; + @Autowired + TbCouponProductMapper couProductMapper; + @Resource + private TbActivateInRecordService activateInRecordService; @Autowired TbmerchantAccountMapper tbmerchantAccountMapper; @Autowired @@ -369,35 +377,7 @@ public class MemberService { flow.setIsReturn("0"); tbShopUserFlowMapper.insert(flow); - BigDecimal fl = null; - TbActivate activate = tbActivateMapper.selectByAmount(shopInfo.getId().toString(), memberIn.getAmount()); - if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) { - BigDecimal awardAmount = BigDecimal.ZERO; - switch (activate.getHandselType()) { - case "GD": - awardAmount = activate.getHandselNum(); - break; - case "RATIO": - awardAmount = memberIn.getAmount().multiply(activate.getHandselNum()); - break; - } - - shopUser.setAmount(shopUser.getAmount().add(awardAmount)); - shopUser.setUpdatedAt(System.currentTimeMillis()); - tbShopUserMapper.updateByPrimaryKeySelective(shopUser); - - flow = new TbShopUserFlow(); - flow.setShopUserId(shopUser.getId()); - flow.setBizCode("scanMemberAwardIn"); - flow.setType("+"); - flow.setBizName("充值活动奖励"); - flow.setAmount(awardAmount); - flow.setBalance(shopUser.getAmount()); - flow.setCreateTime(new Date()); - flow.setIsReturn("0"); - tbShopUserFlowMapper.insert(flow); - fl = awardAmount; - } + BigDecimal fl = giveActivate(shopUser, amount, flow.getId()); JSONObject jsonObject = new JSONObject(); jsonObject.put("token", token); @@ -436,6 +416,92 @@ public class MemberService { } + public BigDecimal giveActivate(TbShopUser tbShopUser, BigDecimal memAmount, Integer flowId) { + TbActivate activate = tbActivateMapper.selectByAmount(tbShopUser.getShopId(), memAmount); + if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) { + if (activate.getIsUseCoupon() == 1) { + TbShopCoupon tbShopCoupon = couponMapper.queryById(activate.getCouponId()); + Date start = new Date(); + Date end = new Date(); + if ("fixed".equals(tbShopCoupon.getValidityType())) { + //固定时间 + end = DateUtil.offsetDay(new Date(),tbShopCoupon.getValidDays()); + } else if ("custom".equals(tbShopCoupon.getValidityType())) { + //自定义时间 + start = tbShopCoupon.getValidStartTime(); + end = tbShopCoupon.getValidEndTime(); + } + if (tbShopCoupon != null) { + List actGiveRecords = new ArrayList<>(); + if(tbShopCoupon.getType() == 1) { + //满减 + TbActivateInRecord record = new TbActivateInRecord(); + record.setVipUserId(Integer.valueOf(tbShopUser.getId())); + record.setCouponId(tbShopCoupon.getId()); + record.setName("满" + tbShopCoupon.getFullAmount() + "减" + tbShopCoupon.getDiscountAmount()); + record.setFullAmount(tbShopCoupon.getFullAmount()); + record.setDiscountAmount(tbShopCoupon.getDiscountAmount()); + record.setType(1); + record.setNum(activate.getNum()); + record.setOverNum(activate.getNum()); + record.setShopId(Integer.valueOf(tbShopUser.getShopId())); + record.setSourceActId(activate.getId()); + record.setSourceFlowId(flowId); + record.setUseStartTime(start); + record.setUseEndTime(end); + record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,null)); + actGiveRecords.add(record); + } else if (tbShopCoupon.getType() == 2) { + //商品卷 + List tbCouponProducts = couProductMapper.queryAllByCouponId(tbShopCoupon.getId()); + for (TbCouponProduct actPro : tbCouponProducts) { + TbActivateInRecord record = new TbActivateInRecord(); + record.setVipUserId(tbShopUser.getId()); + record.setCouponId(tbShopCoupon.getId()); + record.setName("商品卷"); + record.setType(2); + record.setProId(actPro.getProductId()); + record.setNum(actPro.getNum()*tbShopCoupon.getNumber()); + record.setOverNum(actPro.getNum()*tbShopCoupon.getNumber()); + record.setShopId(Integer.valueOf(tbShopUser.getShopId())); + record.setSourceActId(activate.getId()); + record.setSourceFlowId(flowId); + record.setUseStartTime(start); + record.setUseEndTime(end); + record.setCouponJson(activateInRecordService.getCouponJson(activate,tbShopCoupon,actPro)); + actGiveRecords.add(record); + } + } + activateInRecordMapper.insertBatch(actGiveRecords); + tbShopCoupon.setLeftNumber(tbShopCoupon.getLeftNumber()-activate.getNum()); + couponMapper.update(tbShopCoupon); + } + } + + BigDecimal amount = activate.getGiftAmount() == null ? + BigDecimal.ZERO : new BigDecimal(activate.getGiftAmount()); + + tbShopUser.setAmount(tbShopUser.getAmount().add(amount)); + tbShopUser.setUpdatedAt(System.currentTimeMillis()); + tbShopUserMapper.updateByPrimaryKeySelective(tbShopUser); + + TbShopUserFlow flow = new TbShopUserFlow(); + flow.setShopUserId(Integer.valueOf(tbShopUser.getId())); + flow.setBizCode("scanMemberAwardIn"); + flow.setBizName("充值活动奖励"); + flow.setType("+"); + flow.setAmount(amount); + flow.setBalance(tbShopUser.getAmount()); + flow.setCreateTime(new Date()); + flow.setIsReturn("0"); + tbShopUserFlowMapper.insert(flow); + return amount; + } + + return null; + } + + public Result queryScanPay(String flowId, String token) { if (ObjectUtil.isEmpty(flowId)) { return Result.fail(CodeEnum.PARAM); @@ -526,15 +592,7 @@ public class MemberService { TbActivate activate = tbActivateMapper.selectByAmount(shopUser.getId().toString(), memberIn.getAmount()); if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) { - BigDecimal awardAmount = BigDecimal.ZERO; - switch (activate.getHandselType()) { - case "GD": - awardAmount = activate.getHandselNum(); - break; - case "RATIO": - awardAmount = memberIn.getAmount().multiply(activate.getHandselNum()); - break; - } + BigDecimal awardAmount = activate.getGiftAmount() == null ? BigDecimal.ZERO : new BigDecimal(activate.getGiftAmount()); shopUser.setAmount(shopUser.getAmount().add(awardAmount)); shopUser.setUpdatedAt(System.currentTimeMillis()); @@ -549,7 +607,7 @@ public class MemberService { flow.setBalance(shopUser.getAmount()); flow.setIsReturn("0"); flow.setCreateTime(new Date()); - + tbShopUserFlowMapper.insert(flow); JSONObject jsonObject = new JSONObject(); jsonObject.put("token", token); @@ -567,8 +625,6 @@ public class MemberService { baObj.put("type", "充值"); baObj.put("time", flow.getCreateTime()); producer.balance(baObj.toString()); - - tbShopUserFlowMapper.insert(flow); } return Result.success(CodeEnum.SUCCESS, memberIn); @@ -671,38 +727,7 @@ public class MemberService { flow.get().setCreateTime(new Date()); flow.get().setIsReturn("0"); tbShopUserFlowMapper.insert(flow.get()); - - TbActivate activate = tbActivateMapper.selectByAmount(shopInfo.getId().toString(), memberIn.getAmount()); - if (ObjectUtil.isNotEmpty(activate) && ObjectUtil.isNotNull(activate)) { - BigDecimal awardAmount = BigDecimal.ZERO; - switch (activate.getHandselType()) { - case "GD": - awardAmount = activate.getHandselNum(); - break; - case "RATIO": - awardAmount = memberIn.getAmount().multiply(activate.getHandselNum()); - break; - } - - shopUser.setAmount(shopUser.getAmount().add(awardAmount)); - shopUser.setUpdatedAt(System.currentTimeMillis()); - tbShopUserMapper.updateByPrimaryKeySelective(shopUser); - - flow.set(new TbShopUserFlow()); - flow.get().setShopUserId(shopUser.getId()); - flow.get().setBizCode("scanMemberAwardIn"); - flow.get().setType("+"); - flow.get().setBizName("充值活动奖励"); - flow.get().setAmount(awardAmount); - flow.get().setBalance(shopUser.getAmount()); - flow.get().setCreateTime(new Date()); - flow.get().setIsReturn("0"); - tbShopUserFlowMapper.insert(flow.get()); - - fl.set(awardAmount); - - } - + fl.set(giveActivate(shopUser, amount, flow.get().getId())); return null; }); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java new file mode 100644 index 0000000..fb12c4a --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbActivateInRecordService.java @@ -0,0 +1,25 @@ +package com.chaozhanggui.system.cashierservice.service; + +import com.alibaba.fastjson.JSONObject; +import com.chaozhanggui.system.cashierservice.entity.TbActivate; +import com.chaozhanggui.system.cashierservice.entity.TbCouponProduct; +import com.chaozhanggui.system.cashierservice.entity.TbShopCoupon; +import org.springframework.stereotype.Service; + +/** + * 活动商品赠送表(TbActivateInRecord)表服务接口 + * + * @author ww + * @since 2024-08-22 11:13:40 + */ +@Service +public class TbActivateInRecordService { + + public String getCouponJson(TbActivate activate, TbShopCoupon tbShopCoupon, TbCouponProduct couProduct){ + JSONObject result = new JSONObject(); + result.put("activate",JSONObject.toJSON(activate)); + result.put("coupon",JSONObject.toJSON(tbShopCoupon)); + result.put("couProduct",JSONObject.toJSON(couProduct)); + return result.toJSONString(); + } +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/task/ShopInfoStatusTask.java b/src/main/java/com/chaozhanggui/system/cashierservice/task/ShopInfoStatusTask.java deleted file mode 100644 index e9ac24f..0000000 --- a/src/main/java/com/chaozhanggui/system/cashierservice/task/ShopInfoStatusTask.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.chaozhanggui.system.cashierservice.task; - -import cn.hutool.core.util.ObjectUtil; -import com.chaozhanggui.system.cashierservice.cache.DataCache; -import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper; -import com.chaozhanggui.system.cashierservice.dao.TbShopOnlineMapper; -import com.chaozhanggui.system.cashierservice.entity.TbShopInfo; -import com.chaozhanggui.system.cashierservice.entity.TbShopOnline; -import com.chaozhanggui.system.cashierservice.util.DateUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.Enumeration; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; - -@Component -@Slf4j -public class ShopInfoStatusTask { - - - @Autowired - TbShopInfoMapper tbShopInfoMapper; - - - @Autowired - TbShopOnlineMapper tbShopOnlineMapper; - - -// @Scheduled(initialDelay = 2000,fixedDelay = 500) - public void modifyShopStatus(){ - ConcurrentHashMap concurrentHashMap= DataCache.concurrentHashMap; - - Enumeration keys= concurrentHashMap.keys(); - while (keys.hasMoreElements()) { - String key = keys.nextElement(); - TbShopInfo shopInfo = concurrentHashMap.get(key); - if (shopInfo.getBusinessTime() == null || ObjectUtil.isEmpty(shopInfo.getBusinessTime())) { - shopInfo.setOnSale(Byte.parseByte("0")); - shopInfo.setStatus(Byte.parseByte("0")); - shopInfo.setUpdatedAt(System.currentTimeMillis()); - tbShopInfoMapper.updateByPrimaryKeyWithBLOBs(shopInfo); - continue; - } - - try { - deal(shopInfo); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Transactional(rollbackFor = Exception.class) - public void deal(TbShopInfo shopInfo) throws Exception{ - TbShopOnline online= tbShopOnlineMapper.selectByPrimaryKey(shopInfo.getId()); - if(Objects.isNull(online)||ObjectUtil.isEmpty(online)){ - log.error("店铺信息不存在：{}",shopInfo.getId()); - return; - } - - - switch (shopInfo.getOnSale().toString()){ - case "0": - if(new Date().compareTo(online.getStartTime())>0&&online.getEndTime().compareTo(new Date())>0){ - shopInfo.setOnSale(Byte.parseByte("1")); - shopInfo.setStatus(Byte.parseByte("1")); - shopInfo.setCreatedAt(System.currentTimeMillis()); - tbShopInfoMapper.updateByPrimaryKey(shopInfo); - - - online.setStatus("1"); - online.setUpdateTime(new Date()); - tbShopOnlineMapper.updateByPrimaryKey(online); - DataCache.concurrentHashMap.put(shopInfo.getId().toString(),shopInfo); - } - break; - case "1": - if(online.getStartTime().compareTo(new Date())>0||new Date().compareTo(online.getEndTime())>0){ - shopInfo.setOnSale(Byte.parseByte("1")); - shopInfo.setStatus(Byte.parseByte("1")); - shopInfo.setCreatedAt(System.currentTimeMillis()); - tbShopInfoMapper.updateByPrimaryKey(shopInfo); - - online.setStartTime(DateUtils.getNewDate(online.getStartTime(),3,1)); - online.setEndTime(DateUtils.getNewDate(online.getEndTime(),3,1)); - online.setStatus("0"); - online.setUpdateTime(new Date()); - tbShopOnlineMapper.updateByPrimaryKey(online); - } - break; - } - - } - - -} diff --git a/src/main/resources/mapper/CodeColumnConfigMapper.xml b/src/main/resources/mapper/CodeColumnConfigMapper.xml deleted file mode 100644 index e0d67b9..0000000 --- a/src/main/resources/mapper/CodeColumnConfigMapper.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - column_id, table_name, column_name, column_type, dict_name, extra, form_show, form_type, - key_type, list_show, not_null, query_type, remark, date_annotation - - - - delete from code_column_config - where column_id = #{columnId,jdbcType=BIGINT} - - - insert into code_column_config (column_id, table_name, column_name, - column_type, dict_name, extra, - form_show, form_type, key_type, - list_show, not_null, query_type, - remark, date_annotation) - values (#{columnId,jdbcType=BIGINT}, #{tableName,jdbcType=VARCHAR}, #{columnName,jdbcType=VARCHAR}, - #{columnType,jdbcType=VARCHAR}, #{dictName,jdbcType=VARCHAR}, #{extra,jdbcType=VARCHAR}, - #{formShow,jdbcType=BIT}, #{formType,jdbcType=VARCHAR}, #{keyType,jdbcType=VARCHAR}, - #{listShow,jdbcType=BIT}, #{notNull,jdbcType=BIT}, #{queryType,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{dateAnnotation,jdbcType=VARCHAR}) - - - insert into code_column_config - - - column_id, - - - table_name, - - - column_name, - - - column_type, - - - dict_name, - - - extra, - - - form_show, - - - form_type, - - - key_type, - - - list_show, - - - not_null, - - - query_type, - - - remark, - - - date_annotation, - - - - - #{columnId,jdbcType=BIGINT}, - - - #{tableName,jdbcType=VARCHAR}, - - - #{columnName,jdbcType=VARCHAR}, - - - #{columnType,jdbcType=VARCHAR}, - - - #{dictName,jdbcType=VARCHAR}, - - - #{extra,jdbcType=VARCHAR}, - - - #{formShow,jdbcType=BIT}, - - - #{formType,jdbcType=VARCHAR}, - - - #{keyType,jdbcType=VARCHAR}, - - - #{listShow,jdbcType=BIT}, - - - #{notNull,jdbcType=BIT}, - - - #{queryType,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{dateAnnotation,jdbcType=VARCHAR}, - - - - - update code_column_config - - - table_name = #{tableName,jdbcType=VARCHAR}, - - - column_name = #{columnName,jdbcType=VARCHAR}, - - - column_type = #{columnType,jdbcType=VARCHAR}, - - - dict_name = #{dictName,jdbcType=VARCHAR}, - - - extra = #{extra,jdbcType=VARCHAR}, - - - form_show = #{formShow,jdbcType=BIT}, - - - form_type = #{formType,jdbcType=VARCHAR}, - - - key_type = #{keyType,jdbcType=VARCHAR}, - - - list_show = #{listShow,jdbcType=BIT}, - - - not_null = #{notNull,jdbcType=BIT}, - - - query_type = #{queryType,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - date_annotation = #{dateAnnotation,jdbcType=VARCHAR}, - - - where column_id = #{columnId,jdbcType=BIGINT} - - - update code_column_config - set table_name = #{tableName,jdbcType=VARCHAR}, - column_name = #{columnName,jdbcType=VARCHAR}, - column_type = #{columnType,jdbcType=VARCHAR}, - dict_name = #{dictName,jdbcType=VARCHAR}, - extra = #{extra,jdbcType=VARCHAR}, - form_show = #{formShow,jdbcType=BIT}, - form_type = #{formType,jdbcType=VARCHAR}, - key_type = #{keyType,jdbcType=VARCHAR}, - list_show = #{listShow,jdbcType=BIT}, - not_null = #{notNull,jdbcType=BIT}, - query_type = #{queryType,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - date_annotation = #{dateAnnotation,jdbcType=VARCHAR} - where column_id = #{columnId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper/CodeGenConfigMapper.xml b/src/main/resources/mapper/CodeGenConfigMapper.xml deleted file mode 100644 index 66a73d4..0000000 --- a/src/main/resources/mapper/CodeGenConfigMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - config_id, table_name, author, cover, module_name, pack, path, api_path, prefix, - api_alias - - - - delete from code_gen_config - where config_id = #{configId,jdbcType=BIGINT} - - - insert into code_gen_config (config_id, table_name, author, - cover, module_name, pack, - path, api_path, prefix, - api_alias) - values (#{configId,jdbcType=BIGINT}, #{tableName,jdbcType=VARCHAR}, #{author,jdbcType=VARCHAR}, - #{cover,jdbcType=BIT}, #{moduleName,jdbcType=VARCHAR}, #{pack,jdbcType=VARCHAR}, - #{path,jdbcType=VARCHAR}, #{apiPath,jdbcType=VARCHAR}, #{prefix,jdbcType=VARCHAR}, - #{apiAlias,jdbcType=VARCHAR}) - - - insert into code_gen_config - - - config_id, - - - table_name, - - - author, - - - cover, - - - module_name, - - - pack, - - - path, - - - api_path, - - - prefix, - - - api_alias, - - - - - #{configId,jdbcType=BIGINT}, - - - #{tableName,jdbcType=VARCHAR}, - - - #{author,jdbcType=VARCHAR}, - - - #{cover,jdbcType=BIT}, - - - #{moduleName,jdbcType=VARCHAR}, - - - #{pack,jdbcType=VARCHAR}, - - - #{path,jdbcType=VARCHAR}, - - - #{apiPath,jdbcType=VARCHAR}, - - - #{prefix,jdbcType=VARCHAR}, - - - #{apiAlias,jdbcType=VARCHAR}, - - - - - update code_gen_config - - - table_name = #{tableName,jdbcType=VARCHAR}, - - - author = #{author,jdbcType=VARCHAR}, - - - cover = #{cover,jdbcType=BIT}, - - - module_name = #{moduleName,jdbcType=VARCHAR}, - - - pack = #{pack,jdbcType=VARCHAR}, - - - path = #{path,jdbcType=VARCHAR}, - - - api_path = #{apiPath,jdbcType=VARCHAR}, - - - prefix = #{prefix,jdbcType=VARCHAR}, - - - api_alias = #{apiAlias,jdbcType=VARCHAR}, - - - where config_id = #{configId,jdbcType=BIGINT} - - - update code_gen_config - set table_name = #{tableName,jdbcType=VARCHAR}, - author = #{author,jdbcType=VARCHAR}, - cover = #{cover,jdbcType=BIT}, - module_name = #{moduleName,jdbcType=VARCHAR}, - pack = #{pack,jdbcType=VARCHAR}, - path = #{path,jdbcType=VARCHAR}, - api_path = #{apiPath,jdbcType=VARCHAR}, - prefix = #{prefix,jdbcType=VARCHAR}, - api_alias = #{apiAlias,jdbcType=VARCHAR} - where config_id = #{configId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntAppMapper.xml b/src/main/resources/mapper/MntAppMapper.xml deleted file mode 100644 index 9e911b0..0000000 --- a/src/main/resources/mapper/MntAppMapper.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - app_id, name, upload_path, deploy_path, backup_path, port, start_script, deploy_script, - create_by, update_by, create_time, update_time - - - - delete from mnt_app - where app_id = #{appId,jdbcType=BIGINT} - - - insert into mnt_app (app_id, name, upload_path, - deploy_path, backup_path, port, - start_script, deploy_script, create_by, - update_by, create_time, update_time - ) - values (#{appId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{uploadPath,jdbcType=VARCHAR}, - #{deployPath,jdbcType=VARCHAR}, #{backupPath,jdbcType=VARCHAR}, #{port,jdbcType=INTEGER}, - #{startScript,jdbcType=VARCHAR}, #{deployScript,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, - #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into mnt_app - - - app_id, - - - name, - - - upload_path, - - - deploy_path, - - - backup_path, - - - port, - - - start_script, - - - deploy_script, - - - create_by, - - - update_by, - - - create_time, - - - update_time, - - - - - #{appId,jdbcType=BIGINT}, - - - #{name,jdbcType=VARCHAR}, - - - #{uploadPath,jdbcType=VARCHAR}, - - - #{deployPath,jdbcType=VARCHAR}, - - - #{backupPath,jdbcType=VARCHAR}, - - - #{port,jdbcType=INTEGER}, - - - #{startScript,jdbcType=VARCHAR}, - - - #{deployScript,jdbcType=VARCHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update mnt_app - - - name = #{name,jdbcType=VARCHAR}, - - - upload_path = #{uploadPath,jdbcType=VARCHAR}, - - - deploy_path = #{deployPath,jdbcType=VARCHAR}, - - - backup_path = #{backupPath,jdbcType=VARCHAR}, - - - port = #{port,jdbcType=INTEGER}, - - - start_script = #{startScript,jdbcType=VARCHAR}, - - - deploy_script = #{deployScript,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where app_id = #{appId,jdbcType=BIGINT} - - - update mnt_app - set name = #{name,jdbcType=VARCHAR}, - upload_path = #{uploadPath,jdbcType=VARCHAR}, - deploy_path = #{deployPath,jdbcType=VARCHAR}, - backup_path = #{backupPath,jdbcType=VARCHAR}, - port = #{port,jdbcType=INTEGER}, - start_script = #{startScript,jdbcType=VARCHAR}, - deploy_script = #{deployScript,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - update_by = #{updateBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where app_id = #{appId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntDatabaseMapper.xml b/src/main/resources/mapper/MntDatabaseMapper.xml deleted file mode 100644 index b15b917..0000000 --- a/src/main/resources/mapper/MntDatabaseMapper.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - db_id, name, jdbc_url, user_name, pwd, create_by, update_by, create_time, update_time - - - - delete from mnt_database - where db_id = #{dbId,jdbcType=VARCHAR} - - - insert into mnt_database (db_id, name, jdbc_url, - user_name, pwd, create_by, - update_by, create_time, update_time - ) - values (#{dbId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{jdbcUrl,jdbcType=VARCHAR}, - #{userName,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, - #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into mnt_database - - - db_id, - - - name, - - - jdbc_url, - - - user_name, - - - pwd, - - - create_by, - - - update_by, - - - create_time, - - - update_time, - - - - - #{dbId,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{jdbcUrl,jdbcType=VARCHAR}, - - - #{userName,jdbcType=VARCHAR}, - - - #{pwd,jdbcType=VARCHAR}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update mnt_database - - - name = #{name,jdbcType=VARCHAR}, - - - jdbc_url = #{jdbcUrl,jdbcType=VARCHAR}, - - - user_name = #{userName,jdbcType=VARCHAR}, - - - pwd = #{pwd,jdbcType=VARCHAR}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where db_id = #{dbId,jdbcType=VARCHAR} - - - update mnt_database - set name = #{name,jdbcType=VARCHAR}, - jdbc_url = #{jdbcUrl,jdbcType=VARCHAR}, - user_name = #{userName,jdbcType=VARCHAR}, - pwd = #{pwd,jdbcType=VARCHAR}, - create_by = #{createBy,jdbcType=VARCHAR}, - update_by = #{updateBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where db_id = #{dbId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntDeployHistoryMapper.xml b/src/main/resources/mapper/MntDeployHistoryMapper.xml deleted file mode 100644 index ab87493..0000000 --- a/src/main/resources/mapper/MntDeployHistoryMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - history_id, app_name, deploy_date, deploy_user, ip, deploy_id - - - - delete from mnt_deploy_history - where history_id = #{historyId,jdbcType=VARCHAR} - - - insert into mnt_deploy_history (history_id, app_name, deploy_date, - deploy_user, ip, deploy_id - ) - values (#{historyId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, #{deployDate,jdbcType=TIMESTAMP}, - #{deployUser,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{deployId,jdbcType=BIGINT} - ) - - - insert into mnt_deploy_history - - - history_id, - - - app_name, - - - deploy_date, - - - deploy_user, - - - ip, - - - deploy_id, - - - - - #{historyId,jdbcType=VARCHAR}, - - - #{appName,jdbcType=VARCHAR}, - - - #{deployDate,jdbcType=TIMESTAMP}, - - - #{deployUser,jdbcType=VARCHAR}, - - - #{ip,jdbcType=VARCHAR}, - - - #{deployId,jdbcType=BIGINT}, - - - - - update mnt_deploy_history - - - app_name = #{appName,jdbcType=VARCHAR}, - - - deploy_date = #{deployDate,jdbcType=TIMESTAMP}, - - - deploy_user = #{deployUser,jdbcType=VARCHAR}, - - - ip = #{ip,jdbcType=VARCHAR}, - - - deploy_id = #{deployId,jdbcType=BIGINT}, - - - where history_id = #{historyId,jdbcType=VARCHAR} - - - update mnt_deploy_history - set app_name = #{appName,jdbcType=VARCHAR}, - deploy_date = #{deployDate,jdbcType=TIMESTAMP}, - deploy_user = #{deployUser,jdbcType=VARCHAR}, - ip = #{ip,jdbcType=VARCHAR}, - deploy_id = #{deployId,jdbcType=BIGINT} - where history_id = #{historyId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntDeployMapper.xml b/src/main/resources/mapper/MntDeployMapper.xml deleted file mode 100644 index 3865a3f..0000000 --- a/src/main/resources/mapper/MntDeployMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - deploy_id, app_id, create_by, update_by, create_time, update_time - - - - delete from mnt_deploy - where deploy_id = #{deployId,jdbcType=BIGINT} - - - insert into mnt_deploy (deploy_id, app_id, create_by, - update_by, create_time, update_time - ) - values (#{deployId,jdbcType=BIGINT}, #{appId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, - #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} - ) - - - insert into mnt_deploy - - - deploy_id, - - - app_id, - - - create_by, - - - update_by, - - - create_time, - - - update_time, - - - - - #{deployId,jdbcType=BIGINT}, - - - #{appId,jdbcType=BIGINT}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update mnt_deploy - - - app_id = #{appId,jdbcType=BIGINT}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where deploy_id = #{deployId,jdbcType=BIGINT} - - - update mnt_deploy - set app_id = #{appId,jdbcType=BIGINT}, - create_by = #{createBy,jdbcType=VARCHAR}, - update_by = #{updateBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where deploy_id = #{deployId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntDeployServerMapper.xml b/src/main/resources/mapper/MntDeployServerMapper.xml deleted file mode 100644 index bbfd022..0000000 --- a/src/main/resources/mapper/MntDeployServerMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - delete from mnt_deploy_server - where deploy_id = #{deployId,jdbcType=BIGINT} - and server_id = #{serverId,jdbcType=BIGINT} - - - insert into mnt_deploy_server (deploy_id, server_id) - values (#{deployId,jdbcType=BIGINT}, #{serverId,jdbcType=BIGINT}) - - - insert into mnt_deploy_server - - - deploy_id, - - - server_id, - - - - - #{deployId,jdbcType=BIGINT}, - - - #{serverId,jdbcType=BIGINT}, - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/MntServerMapper.xml b/src/main/resources/mapper/MntServerMapper.xml deleted file mode 100644 index dc496cc..0000000 --- a/src/main/resources/mapper/MntServerMapper.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - server_id, account, ip, name, password, port, create_by, update_by, create_time, - update_time - - - - delete from mnt_server - where server_id = #{serverId,jdbcType=BIGINT} - - - insert into mnt_server (server_id, account, ip, - name, password, port, - create_by, update_by, create_time, - update_time) - values (#{serverId,jdbcType=BIGINT}, #{account,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{port,jdbcType=INTEGER}, - #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - insert into mnt_server - - - server_id, - - - account, - - - ip, - - - name, - - - password, - - - port, - - - create_by, - - - update_by, - - - create_time, - - - update_time, - - - - - #{serverId,jdbcType=BIGINT}, - - - #{account,jdbcType=VARCHAR}, - - - #{ip,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{password,jdbcType=VARCHAR}, - - - #{port,jdbcType=INTEGER}, - - - #{createBy,jdbcType=VARCHAR}, - - - #{updateBy,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update mnt_server - - - account = #{account,jdbcType=VARCHAR}, - - - ip = #{ip,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - password = #{password,jdbcType=VARCHAR}, - - - port = #{port,jdbcType=INTEGER}, - - - create_by = #{createBy,jdbcType=VARCHAR}, - - - update_by = #{updateBy,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where server_id = #{serverId,jdbcType=BIGINT} - - - update mnt_server - set account = #{account,jdbcType=VARCHAR}, - ip = #{ip,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - password = #{password,jdbcType=VARCHAR}, - port = #{port,jdbcType=INTEGER}, - create_by = #{createBy,jdbcType=VARCHAR}, - update_by = #{updateBy,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where server_id = #{serverId,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbActivateInRecordMapper.xml b/src/main/resources/mapper/TbActivateInRecordMapper.xml new file mode 100644 index 0000000..04c85c0 --- /dev/null +++ b/src/main/resources/mapper/TbActivateInRecordMapper.xml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id + , vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, coupon_json + + + + + + + + + + + insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, + over_num, shop_id, source_act_id, source_flow_id, use_start_time, + use_end_time, create_time, update_time, coupon_json) + values (#{vipUserId}, #{couponId}, #{name}, #{type}, #{proId}, #{fullAmount}, #{discountAmount}, #{num}, + #{overNum}, #{shopId}, #{sourceActId}, #{sourceFlowId}, #{useStartTime}, #{useEndTime}, #{createTime}, + #{updateTime}, #{couponJson}) + + + + insert into tb_activate_in_record(vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, num, + over_num, shop_id, source_act_id, source_flow_id, use_start_time, use_end_time, create_time, update_time, + coupon_json) + values + + (#{entity.vipUserId}, #{entity.couponId}, #{entity.name}, #{entity.type}, #{entity.proId}, + #{entity.fullAmount}, #{entity.discountAmount}, #{entity.num}, #{entity.overNum}, #{entity.shopId}, + #{entity.sourceActId}, #{entity.sourceFlowId}, #{entity.useStartTime}, #{entity.useEndTime}, + #{entity.createTime}, #{entity.updateTime}, #{entity.couponJson}) + + + + + + update tb_activate_in_record + + + vip_user_id = #{vipUserId}, + + + coupon_id = #{couponId}, + + + name = #{name}, + + + type = #{type}, + + + pro_id = #{proId}, + + + full_amount = #{fullAmount}, + + + discount_amount = #{discountAmount}, + + + num = #{num}, + + + over_num = #{overNum}, + + + shop_id = #{shopId}, + + + source_act_id = #{sourceActId}, + + + source_flow_id = #{sourceFlowId}, + + + use_start_time = #{useStartTime}, + + + use_end_time = #{useEndTime}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + coupon_json = #{couponJson}, + + + where id = #{id} + + + + + delete + from tb_activate_in_record + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbActivateMapper.xml b/src/main/resources/mapper/TbActivateMapper.xml index 50bdfce..8dc9bc7 100644 --- a/src/main/resources/mapper/TbActivateMapper.xml +++ b/src/main/resources/mapper/TbActivateMapper.xml @@ -1,127 +1,133 @@ - - - - - - - - - - - id, shop_id, min_num, max_num, handsel_num, handsel_type, is_del - - - - delete from tb_activate - where id = #{id,jdbcType=INTEGER} - - - insert into tb_activate (id, shop_id, min_num, - max_num, handsel_num, handsel_type, - is_del) - values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{minNum,jdbcType=INTEGER}, - #{maxNum,jdbcType=INTEGER}, #{handselNum,jdbcType=DECIMAL}, #{handselType,jdbcType=VARCHAR}, - #{isDel,jdbcType=VARCHAR}) - - - insert into tb_activate - - - id, - - - shop_id, - - - min_num, - - - max_num, - - - handsel_num, - - - handsel_type, - - - is_del, - - - - - #{id,jdbcType=INTEGER}, - - - #{shopId,jdbcType=INTEGER}, - - - #{minNum,jdbcType=INTEGER}, - - - #{maxNum,jdbcType=INTEGER}, - - - #{handselNum,jdbcType=DECIMAL}, - - - #{handselType,jdbcType=VARCHAR}, - - - #{isDel,jdbcType=VARCHAR}, - - - - - update tb_activate - - - shop_id = #{shopId,jdbcType=INTEGER}, - - - min_num = #{minNum,jdbcType=INTEGER}, - - - max_num = #{maxNum,jdbcType=INTEGER}, - - - handsel_num = #{handselNum,jdbcType=DECIMAL}, - - - handsel_type = #{handselType,jdbcType=VARCHAR}, - - - is_del = #{isDel,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_activate - set shop_id = #{shopId,jdbcType=INTEGER}, - min_num = #{minNum,jdbcType=INTEGER}, - max_num = #{maxNum,jdbcType=INTEGER}, - handsel_num = #{handselNum,jdbcType=DECIMAL}, - handsel_type = #{handselType,jdbcType=VARCHAR}, - is_del = #{isDel,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - + select * + from tb_activate + where shop_id = #{shopId} + and amount = #{amount} + ORDER BY amount desc + limit 1 - \ No newline at end of file + + + + + + + + + + + insert into tb_activate(shop_id, amount, gift_amount, is_use_coupon, coupon_id, num, create_time, update_time) + values (#{shopId}, #{amount}, #{giftAmount}, #{isUseCoupon}, #{couponId}, #{num}, #{createTime}, #{updateTime}) + + + + insert into tb_activate(shop_id, amount, gift_amount, is_use_coupon, coupon_id, num, create_time, update_time) + values + + (#{entity.shopId}, #{entity.amount}, #{entity.giftAmount}, #{entity.isUseCoupon}, #{entity.couponId}, + #{entity.num}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_activate + + + shop_id = #{shopId}, + + + amount = #{amount}, + + + gift_amount = #{giftAmount}, + + + is_use_coupon = #{isUseCoupon}, + + + coupon_id = #{couponId}, + + + num = #{num}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_activate + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbActivateOutRecordMapper.xml b/src/main/resources/mapper/TbActivateOutRecordMapper.xml new file mode 100644 index 0000000..faa0789 --- /dev/null +++ b/src/main/resources/mapper/TbActivateOutRecordMapper.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + id + , shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, create_time, update_time + + + + + + + + + + + insert into tb_activate_out_record(shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, + create_time, update_time) + values (#{shopId}, #{orderId}, #{giveId}, #{vipUserId}, #{type}, #{useNum}, #{refNum}, #{status}, #{createTime}, + #{updateTime}) + + + + insert into tb_activate_out_record(shop_id, order_id, give_id, vip_user_id, type, use_num, ref_num, status, + create_time, update_time) + values + + (#{entity.shopId}, #{entity.orderId}, #{entity.giveId}, #{entity.vipUserId}, #{entity.type}, + #{entity.useNum}, #{entity.refNum}, #{entity.status}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_activate_out_record + + + shop_id = #{shopId}, + + + order_id = #{orderId}, + + + give_id = #{giveId}, + + + vip_user_id = #{vipUserId}, + + + type = #{type}, + + + use_num = #{useNum}, + + + ref_num = #{refNum}, + + + status = #{status}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_activate_out_record + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbCouponProductMapper.xml b/src/main/resources/mapper/TbCouponProductMapper.xml new file mode 100644 index 0000000..5c4d3cc --- /dev/null +++ b/src/main/resources/mapper/TbCouponProductMapper.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + id + , coupon_id, product_id, num, create_time, update_time + + + + + + + + + + + + + insert into tb_coupon_product(coupon_id, product_id, num, create_time, update_time) + values (#{couponId}, #{productId}, #{num}, #{createTime}, #{updateTime}) + + + + insert into tb_coupon_product(coupon_id, product_id, num, create_time, update_time) + values + + (#{entity.couponId}, #{entity.productId}, #{entity.num}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_coupon_product + + + coupon_id = #{couponId}, + + + product_id = #{productId}, + + + num = #{num}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_coupon_product + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml b/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml deleted file mode 100644 index bd36c49..0000000 --- a/src/main/resources/mapper/TbDeviceOperateInfoMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - id, deviceNo, type, shop_id, createTime, remark - - - - delete from tb_device_operate_info - where id = #{id,jdbcType=INTEGER} - - - insert into tb_device_operate_info (id, deviceNo, type, - shop_id, createTime, remark - ) - values (#{id,jdbcType=INTEGER}, #{deviceno,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, - #{shopId,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR} - ) - - - insert into tb_device_operate_info - - - id, - - - deviceNo, - - - type, - - - shop_id, - - - createTime, - - - remark, - - - - - #{id,jdbcType=INTEGER}, - - - #{deviceno,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{remark,jdbcType=VARCHAR}, - - - - - update tb_device_operate_info - - - deviceNo = #{deviceno,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_device_operate_info - set deviceNo = #{deviceno,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - shop_id = #{shopId,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - remark = #{remark,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml b/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml deleted file mode 100644 index b67bfe7..0000000 --- a/src/main/resources/mapper/TbPlussDeviceGoodsMapper.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, code, name, deviceLogo, introDesc, sort, status, tagId, depositFlag, createTime, - updateTime - - - detail - - - - delete from tb_pluss_device_goods - where id = #{id,jdbcType=INTEGER} - - - insert into tb_pluss_device_goods (id, code, name, - deviceLogo, introDesc, sort, - status, tagId, depositFlag, - createTime, updateTime, detail - ) - values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{devicelogo,jdbcType=VARCHAR}, #{introdesc,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, - #{status,jdbcType=INTEGER}, #{tagid,jdbcType=INTEGER}, #{depositflag,jdbcType=VARCHAR}, - #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}, #{detail,jdbcType=LONGVARCHAR} - ) - - - insert into tb_pluss_device_goods - - - id, - - - code, - - - name, - - - deviceLogo, - - - introDesc, - - - sort, - - - status, - - - tagId, - - - depositFlag, - - - createTime, - - - updateTime, - - - detail, - - - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{devicelogo,jdbcType=VARCHAR}, - - - #{introdesc,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{status,jdbcType=INTEGER}, - - - #{tagid,jdbcType=INTEGER}, - - - #{depositflag,jdbcType=VARCHAR}, - - - #{createtime,jdbcType=TIMESTAMP}, - - - #{updatetime,jdbcType=TIMESTAMP}, - - - #{detail,jdbcType=LONGVARCHAR}, - - - - - update tb_pluss_device_goods - - - code = #{code,jdbcType=VARCHAR}, - - - name = #{name,jdbcType=VARCHAR}, - - - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - - - introDesc = #{introdesc,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - status = #{status,jdbcType=INTEGER}, - - - tagId = #{tagid,jdbcType=INTEGER}, - - - depositFlag = #{depositflag,jdbcType=VARCHAR}, - - - createTime = #{createtime,jdbcType=TIMESTAMP}, - - - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - - - detail = #{detail,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_pluss_device_goods - set code = #{code,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - introDesc = #{introdesc,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - status = #{status,jdbcType=INTEGER}, - tagId = #{tagid,jdbcType=INTEGER}, - depositFlag = #{depositflag,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - updateTime = #{updatetime,jdbcType=TIMESTAMP}, - detail = #{detail,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_pluss_device_goods - set code = #{code,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, - deviceLogo = #{devicelogo,jdbcType=VARCHAR}, - introDesc = #{introdesc,jdbcType=VARCHAR}, - sort = #{sort,jdbcType=INTEGER}, - status = #{status,jdbcType=INTEGER}, - tagId = #{tagid,jdbcType=INTEGER}, - depositFlag = #{depositflag,jdbcType=VARCHAR}, - createTime = #{createtime,jdbcType=TIMESTAMP}, - updateTime = #{updatetime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbReceiptSalesMapper.xml b/src/main/resources/mapper/TbReceiptSalesMapper.xml deleted file mode 100644 index 0f0e0c5..0000000 --- a/src/main/resources/mapper/TbReceiptSalesMapper.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id, title, logo, show_contact_info, show_member, show_member_code, show_member_score, - show_member_wallet, footer_remark, show_cash_charge, show_serial_no, big_serial_no, - header_text, header_text_align, footer_text, footer_text_align, footer_image, pre_print, - created_at, updated_at - - - - delete from tb_receipt_sales - where id = #{id,jdbcType=INTEGER} - - - insert into tb_receipt_sales (id, title, logo, - show_contact_info, show_member, show_member_code, - show_member_score, show_member_wallet, footer_remark, - show_cash_charge, show_serial_no, big_serial_no, - header_text, header_text_align, footer_text, - footer_text_align, footer_image, pre_print, - created_at, updated_at) - values (#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, - #{showContactInfo,jdbcType=BIT}, #{showMember,jdbcType=BIT}, #{showMemberCode,jdbcType=BIT}, - #{showMemberScore,jdbcType=BIT}, #{showMemberWallet,jdbcType=BIT}, #{footerRemark,jdbcType=VARCHAR}, - #{showCashCharge,jdbcType=BIT}, #{showSerialNo,jdbcType=BIT}, #{bigSerialNo,jdbcType=BIT}, - #{headerText,jdbcType=VARCHAR}, #{headerTextAlign,jdbcType=VARCHAR}, #{footerText,jdbcType=VARCHAR}, - #{footerTextAlign,jdbcType=VARCHAR}, #{footerImage,jdbcType=VARCHAR}, #{prePrint,jdbcType=VARCHAR}, - #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) - - - insert into tb_receipt_sales - - - id, - - - title, - - - logo, - - - show_contact_info, - - - show_member, - - - show_member_code, - - - show_member_score, - - - show_member_wallet, - - - footer_remark, - - - show_cash_charge, - - - show_serial_no, - - - big_serial_no, - - - header_text, - - - header_text_align, - - - footer_text, - - - footer_text_align, - - - footer_image, - - - pre_print, - - - created_at, - - - updated_at, - - - - - #{id,jdbcType=INTEGER}, - - - #{title,jdbcType=VARCHAR}, - - - #{logo,jdbcType=VARCHAR}, - - - #{showContactInfo,jdbcType=BIT}, - - - #{showMember,jdbcType=BIT}, - - - #{showMemberCode,jdbcType=BIT}, - - - #{showMemberScore,jdbcType=BIT}, - - - #{showMemberWallet,jdbcType=BIT}, - - - #{footerRemark,jdbcType=VARCHAR}, - - - #{showCashCharge,jdbcType=BIT}, - - - #{showSerialNo,jdbcType=BIT}, - - - #{bigSerialNo,jdbcType=BIT}, - - - #{headerText,jdbcType=VARCHAR}, - - - #{headerTextAlign,jdbcType=VARCHAR}, - - - #{footerText,jdbcType=VARCHAR}, - - - #{footerTextAlign,jdbcType=VARCHAR}, - - - #{footerImage,jdbcType=VARCHAR}, - - - #{prePrint,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - - - update tb_receipt_sales - - - title = #{title,jdbcType=VARCHAR}, - - - logo = #{logo,jdbcType=VARCHAR}, - - - show_contact_info = #{showContactInfo,jdbcType=BIT}, - - - show_member = #{showMember,jdbcType=BIT}, - - - show_member_code = #{showMemberCode,jdbcType=BIT}, - - - show_member_score = #{showMemberScore,jdbcType=BIT}, - - - show_member_wallet = #{showMemberWallet,jdbcType=BIT}, - - - footer_remark = #{footerRemark,jdbcType=VARCHAR}, - - - show_cash_charge = #{showCashCharge,jdbcType=BIT}, - - - show_serial_no = #{showSerialNo,jdbcType=BIT}, - - - big_serial_no = #{bigSerialNo,jdbcType=BIT}, - - - header_text = #{headerText,jdbcType=VARCHAR}, - - - header_text_align = #{headerTextAlign,jdbcType=VARCHAR}, - - - footer_text = #{footerText,jdbcType=VARCHAR}, - - - footer_text_align = #{footerTextAlign,jdbcType=VARCHAR}, - - - footer_image = #{footerImage,jdbcType=VARCHAR}, - - - pre_print = #{prePrint,jdbcType=VARCHAR}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_receipt_sales - set title = #{title,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - show_contact_info = #{showContactInfo,jdbcType=BIT}, - show_member = #{showMember,jdbcType=BIT}, - show_member_code = #{showMemberCode,jdbcType=BIT}, - show_member_score = #{showMemberScore,jdbcType=BIT}, - show_member_wallet = #{showMemberWallet,jdbcType=BIT}, - footer_remark = #{footerRemark,jdbcType=VARCHAR}, - show_cash_charge = #{showCashCharge,jdbcType=BIT}, - show_serial_no = #{showSerialNo,jdbcType=BIT}, - big_serial_no = #{bigSerialNo,jdbcType=BIT}, - header_text = #{headerText,jdbcType=VARCHAR}, - header_text_align = #{headerTextAlign,jdbcType=VARCHAR}, - footer_text = #{footerText,jdbcType=VARCHAR}, - footer_text_align = #{footerTextAlign,jdbcType=VARCHAR}, - footer_image = #{footerImage,jdbcType=VARCHAR}, - pre_print = #{prePrint,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbRenewalsPayLogMapper.xml b/src/main/resources/mapper/TbRenewalsPayLogMapper.xml deleted file mode 100644 index ea09b30..0000000 --- a/src/main/resources/mapper/TbRenewalsPayLogMapper.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - id, pay_type, shop_id, order_id, open_id, user_id, transaction_id, amount, status, - remark, attach, expired_at, created_at, updated_at - - - - delete from tb_renewals_pay_log - where id = #{id,jdbcType=INTEGER} - - - insert into tb_renewals_pay_log (id, pay_type, shop_id, - order_id, open_id, user_id, - transaction_id, amount, status, - remark, attach, expired_at, - created_at, updated_at) - values (#{id,jdbcType=INTEGER}, #{payType,jdbcType=VARCHAR}, #{shopId,jdbcType=VARCHAR}, - #{orderId,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, - #{transactionId,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{status,jdbcType=TINYINT}, - #{remark,jdbcType=VARCHAR}, #{attach,jdbcType=VARCHAR}, #{expiredAt,jdbcType=BIGINT}, - #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}) - - - insert into tb_renewals_pay_log - - - id, - - - pay_type, - - - shop_id, - - - order_id, - - - open_id, - - - user_id, - - - transaction_id, - - - amount, - - - status, - - - remark, - - - attach, - - - expired_at, - - - created_at, - - - updated_at, - - - - - #{id,jdbcType=INTEGER}, - - - #{payType,jdbcType=VARCHAR}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{orderId,jdbcType=VARCHAR}, - - - #{openId,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{transactionId,jdbcType=VARCHAR}, - - - #{amount,jdbcType=DECIMAL}, - - - #{status,jdbcType=TINYINT}, - - - #{remark,jdbcType=VARCHAR}, - - - #{attach,jdbcType=VARCHAR}, - - - #{expiredAt,jdbcType=BIGINT}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - - - update tb_renewals_pay_log - - - pay_type = #{payType,jdbcType=VARCHAR}, - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - order_id = #{orderId,jdbcType=VARCHAR}, - - - open_id = #{openId,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - transaction_id = #{transactionId,jdbcType=VARCHAR}, - - - amount = #{amount,jdbcType=DECIMAL}, - - - status = #{status,jdbcType=TINYINT}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - attach = #{attach,jdbcType=VARCHAR}, - - - expired_at = #{expiredAt,jdbcType=BIGINT}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_renewals_pay_log - set pay_type = #{payType,jdbcType=VARCHAR}, - shop_id = #{shopId,jdbcType=VARCHAR}, - order_id = #{orderId,jdbcType=VARCHAR}, - open_id = #{openId,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - transaction_id = #{transactionId,jdbcType=VARCHAR}, - amount = #{amount,jdbcType=DECIMAL}, - status = #{status,jdbcType=TINYINT}, - remark = #{remark,jdbcType=VARCHAR}, - attach = #{attach,jdbcType=VARCHAR}, - expired_at = #{expiredAt,jdbcType=BIGINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopCashSpreadMapper.xml b/src/main/resources/mapper/TbShopCashSpreadMapper.xml deleted file mode 100644 index 87c41c7..0000000 --- a/src/main/resources/mapper/TbShopCashSpreadMapper.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - id, created_at, updated_at - - - sale_receipt, triplicate_receipt, screen_config, tag_config, scale_config - - - - delete from tb_shop_cash_spread - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_cash_spread (id, created_at, updated_at, - sale_receipt, triplicate_receipt, - screen_config, tag_config, scale_config - ) - values (#{id,jdbcType=INTEGER}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{saleReceipt,jdbcType=LONGVARCHAR}, #{triplicateReceipt,jdbcType=LONGVARCHAR}, - #{screenConfig,jdbcType=LONGVARCHAR}, #{tagConfig,jdbcType=LONGVARCHAR}, #{scaleConfig,jdbcType=LONGVARCHAR} - ) - - - insert into tb_shop_cash_spread - - - id, - - - created_at, - - - updated_at, - - - sale_receipt, - - - triplicate_receipt, - - - screen_config, - - - tag_config, - - - scale_config, - - - - - #{id,jdbcType=INTEGER}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{saleReceipt,jdbcType=LONGVARCHAR}, - - - #{triplicateReceipt,jdbcType=LONGVARCHAR}, - - - #{screenConfig,jdbcType=LONGVARCHAR}, - - - #{tagConfig,jdbcType=LONGVARCHAR}, - - - #{scaleConfig,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_cash_spread - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - sale_receipt = #{saleReceipt,jdbcType=LONGVARCHAR}, - - - triplicate_receipt = #{triplicateReceipt,jdbcType=LONGVARCHAR}, - - - screen_config = #{screenConfig,jdbcType=LONGVARCHAR}, - - - tag_config = #{tagConfig,jdbcType=LONGVARCHAR}, - - - scale_config = #{scaleConfig,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_cash_spread - set created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - sale_receipt = #{saleReceipt,jdbcType=LONGVARCHAR}, - triplicate_receipt = #{triplicateReceipt,jdbcType=LONGVARCHAR}, - screen_config = #{screenConfig,jdbcType=LONGVARCHAR}, - tag_config = #{tagConfig,jdbcType=LONGVARCHAR}, - scale_config = #{scaleConfig,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_cash_spread - set created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopCouponMapper.xml b/src/main/resources/mapper/TbShopCouponMapper.xml new file mode 100644 index 0000000..32d2beb --- /dev/null +++ b/src/main/resources/mapper/TbShopCouponMapper.xml @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + , shop_id, title, type, full_amount, discount_amount, description, number, left_number, validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, user_days, use_time_type, use_start_time, use_end_time, use_number, editor, status, create_time, update_time + + + + + + + + + + + insert into tb_shop_coupon(shop_id, title, type, full_amount, discount_amount, description, number, left_number, + validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, + user_days, use_time_type, use_start_time, use_end_time, use_number, editor, status, + create_time, update_time) + values (#{shopId}, #{title}, #{type}, #{fullAmount}, #{discountAmount}, #{description}, #{number}, + #{leftNumber}, #{validityType}, #{validDays}, #{daysToTakeEffect}, #{validStartTime}, #{validEndTime}, + #{userDays}, #{useTimeType}, #{useStartTime}, #{useEndTime}, #{useNumber}, #{editor}, #{status}, + #{createTime}, #{updateTime}) + + + + insert into tb_shop_coupon(shop_id, title, type, full_amount, discount_amount, description, number, left_number, + validity_type, valid_days, days_to_take_effect, valid_start_time, valid_end_time, user_days, use_time_type, + use_start_time, use_end_time, use_number, editor, status, create_time, update_time) + values + + (#{entity.shopId}, #{entity.title}, #{entity.type}, #{entity.fullAmount}, #{entity.discountAmount}, + #{entity.description}, #{entity.number}, #{entity.leftNumber}, #{entity.validityType}, #{entity.validDays}, + #{entity.daysToTakeEffect}, #{entity.validStartTime}, #{entity.validEndTime}, #{entity.userDays}, + #{entity.useTimeType}, #{entity.useStartTime}, #{entity.useEndTime}, #{entity.useNumber}, #{entity.editor}, + #{entity.status}, #{entity.createTime}, #{entity.updateTime}) + + + + + + update tb_shop_coupon + + + shop_id = #{shopId}, + + + title = #{title}, + + + type = #{type}, + + + full_amount = #{fullAmount}, + + + discount_amount = #{discountAmount}, + + + description = #{description}, + + + number = #{number}, + + + left_number = #{leftNumber}, + + + validity_type = #{validityType}, + + + valid_days = #{validDays}, + + + days_to_take_effect = #{daysToTakeEffect}, + + + valid_start_time = #{validStartTime}, + + + valid_end_time = #{validEndTime}, + + + user_days = #{userDays}, + + + use_time_type = #{useTimeType}, + + + use_start_time = #{useStartTime}, + + + use_end_time = #{useEndTime}, + + + use_number = #{useNumber}, + + + editor = #{editor}, + + + status = #{status}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + where id = #{id} + + + + + delete + from tb_shop_coupon + where id = #{id} + + + + diff --git a/src/main/resources/mapper/TbShopCurrencyMapper.xml b/src/main/resources/mapper/TbShopCurrencyMapper.xml deleted file mode 100644 index 503f4e0..0000000 --- a/src/main/resources/mapper/TbShopCurrencyMapper.xml +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, shop_id, prepare_amount, currency, decimals_digits, discount_round, merchant_id, - small_change, enable_custom_discount, max_discount, max_percent, biz_duration, allow_web_pay, - is_auto_to_zero, is_include_tax_price, tax_number, created_at, updated_at, auto_lock_screen, - voice_notification - - - discount_configs, service_charge - - - - delete from tb_shop_currency - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_currency (id, shop_id, prepare_amount, - currency, decimals_digits, discount_round, - merchant_id, small_change, enable_custom_discount, - max_discount, max_percent, biz_duration, - allow_web_pay, is_auto_to_zero, is_include_tax_price, - tax_number, created_at, updated_at, - auto_lock_screen, voice_notification, discount_configs, - service_charge) - values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=VARCHAR}, #{prepareAmount,jdbcType=DECIMAL}, - #{currency,jdbcType=VARCHAR}, #{decimalsDigits,jdbcType=TINYINT}, #{discountRound,jdbcType=VARCHAR}, - #{merchantId,jdbcType=VARCHAR}, #{smallChange,jdbcType=TINYINT}, #{enableCustomDiscount,jdbcType=TINYINT}, - #{maxDiscount,jdbcType=DECIMAL}, #{maxPercent,jdbcType=DOUBLE}, #{bizDuration,jdbcType=VARCHAR}, - #{allowWebPay,jdbcType=TINYINT}, #{isAutoToZero,jdbcType=TINYINT}, #{isIncludeTaxPrice,jdbcType=TINYINT}, - #{taxNumber,jdbcType=VARCHAR}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{autoLockScreen,jdbcType=TINYINT}, #{voiceNotification,jdbcType=TINYINT}, #{discountConfigs,jdbcType=LONGVARCHAR}, - #{serviceCharge,jdbcType=LONGVARCHAR}) - - - insert into tb_shop_currency - - - id, - - - shop_id, - - - prepare_amount, - - - currency, - - - decimals_digits, - - - discount_round, - - - merchant_id, - - - small_change, - - - enable_custom_discount, - - - max_discount, - - - max_percent, - - - biz_duration, - - - allow_web_pay, - - - is_auto_to_zero, - - - is_include_tax_price, - - - tax_number, - - - created_at, - - - updated_at, - - - auto_lock_screen, - - - voice_notification, - - - discount_configs, - - - service_charge, - - - - - #{id,jdbcType=INTEGER}, - - - #{shopId,jdbcType=VARCHAR}, - - - #{prepareAmount,jdbcType=DECIMAL}, - - - #{currency,jdbcType=VARCHAR}, - - - #{decimalsDigits,jdbcType=TINYINT}, - - - #{discountRound,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{smallChange,jdbcType=TINYINT}, - - - #{enableCustomDiscount,jdbcType=TINYINT}, - - - #{maxDiscount,jdbcType=DECIMAL}, - - - #{maxPercent,jdbcType=DOUBLE}, - - - #{bizDuration,jdbcType=VARCHAR}, - - - #{allowWebPay,jdbcType=TINYINT}, - - - #{isAutoToZero,jdbcType=TINYINT}, - - - #{isIncludeTaxPrice,jdbcType=TINYINT}, - - - #{taxNumber,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{autoLockScreen,jdbcType=TINYINT}, - - - #{voiceNotification,jdbcType=TINYINT}, - - - #{discountConfigs,jdbcType=LONGVARCHAR}, - - - #{serviceCharge,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_currency - - - shop_id = #{shopId,jdbcType=VARCHAR}, - - - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - - - currency = #{currency,jdbcType=VARCHAR}, - - - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - - - discount_round = #{discountRound,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - small_change = #{smallChange,jdbcType=TINYINT}, - - - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - - - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - - - max_percent = #{maxPercent,jdbcType=DOUBLE}, - - - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - - - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - - - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - - - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - - - tax_number = #{taxNumber,jdbcType=VARCHAR}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - - - voice_notification = #{voiceNotification,jdbcType=TINYINT}, - - - discount_configs = #{discountConfigs,jdbcType=LONGVARCHAR}, - - - service_charge = #{serviceCharge,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_currency - set shop_id = #{shopId,jdbcType=VARCHAR}, - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - currency = #{currency,jdbcType=VARCHAR}, - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - discount_round = #{discountRound,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - small_change = #{smallChange,jdbcType=TINYINT}, - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - max_percent = #{maxPercent,jdbcType=DOUBLE}, - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - tax_number = #{taxNumber,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - voice_notification = #{voiceNotification,jdbcType=TINYINT}, - discount_configs = #{discountConfigs,jdbcType=LONGVARCHAR}, - service_charge = #{serviceCharge,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_currency - set shop_id = #{shopId,jdbcType=VARCHAR}, - prepare_amount = #{prepareAmount,jdbcType=DECIMAL}, - currency = #{currency,jdbcType=VARCHAR}, - decimals_digits = #{decimalsDigits,jdbcType=TINYINT}, - discount_round = #{discountRound,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - small_change = #{smallChange,jdbcType=TINYINT}, - enable_custom_discount = #{enableCustomDiscount,jdbcType=TINYINT}, - max_discount = #{maxDiscount,jdbcType=DECIMAL}, - max_percent = #{maxPercent,jdbcType=DOUBLE}, - biz_duration = #{bizDuration,jdbcType=VARCHAR}, - allow_web_pay = #{allowWebPay,jdbcType=TINYINT}, - is_auto_to_zero = #{isAutoToZero,jdbcType=TINYINT}, - is_include_tax_price = #{isIncludeTaxPrice,jdbcType=TINYINT}, - tax_number = #{taxNumber,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - auto_lock_screen = #{autoLockScreen,jdbcType=TINYINT}, - voice_notification = #{voiceNotification,jdbcType=TINYINT} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml index e9f9f2b..d82f9da 100644 --- a/src/main/resources/mapper/TbShopInfoMapper.xml +++ b/src/main/resources/mapper/TbShopInfoMapper.xml @@ -1,637 +1,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - id, account, shop_code, sub_title, merchant_id, shop_name, chain_name, back_img, - front_img, contact_name, phone, logo, is_deposit, is_supply, cover_img, share_img, - detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, - industry, industry_name, business_time, post_time, post_amount_line, on_sale, settle_type, - settle_time, enter_at, expire_at, status, average, order_wait_pay_minute, support_device_number, - distribute_level, created_at, updated_at, proxy_id,is_custom,is_return,is_member_in,is_member_return, - is_table_fee,table_fee,eat_model,small_qrcode,payment_qrcode - - - view - - - - delete from tb_shop_info - where id = #{id,jdbcType=INTEGER} - - - insert into tb_shop_info (id, account, shop_code, - sub_title, merchant_id, shop_name, - chain_name, back_img, front_img, - contact_name, phone, logo, - is_deposit, is_supply, cover_img, - share_img, detail, lat, - lng, mch_id, register_type, - is_wx_ma_independent, address, city, - type, industry, industry_name, - business_time, post_time, post_amount_line, - on_sale, settle_type, settle_time, - enter_at, expire_at, status, - average, order_wait_pay_minute, support_device_number, - distribute_level, created_at, updated_at, - proxy_id, view) - values (#{id,jdbcType=INTEGER}, #{account,jdbcType=VARCHAR}, #{shopCode,jdbcType=VARCHAR}, - #{subTitle,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{shopName,jdbcType=VARCHAR}, - #{chainName,jdbcType=VARCHAR}, #{backImg,jdbcType=VARCHAR}, #{frontImg,jdbcType=VARCHAR}, - #{contactName,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{logo,jdbcType=VARCHAR}, - #{isDeposit,jdbcType=TINYINT}, #{isSupply,jdbcType=TINYINT}, #{coverImg,jdbcType=VARCHAR}, - #{shareImg,jdbcType=VARCHAR}, #{detail,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, - #{lng,jdbcType=VARCHAR}, #{mchId,jdbcType=VARCHAR}, #{registerType,jdbcType=VARCHAR}, - #{isWxMaIndependent,jdbcType=TINYINT}, #{address,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, - #{type,jdbcType=VARCHAR}, #{industry,jdbcType=VARCHAR}, #{industryName,jdbcType=VARCHAR}, - #{businessTime,jdbcType=VARCHAR}, #{postTime,jdbcType=VARCHAR}, #{postAmountLine,jdbcType=DECIMAL}, - #{onSale,jdbcType=TINYINT}, #{settleType,jdbcType=TINYINT}, #{settleTime,jdbcType=VARCHAR}, - #{enterAt,jdbcType=INTEGER}, #{expireAt,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, - #{average,jdbcType=REAL}, #{orderWaitPayMinute,jdbcType=INTEGER}, #{supportDeviceNumber,jdbcType=INTEGER}, - #{distributeLevel,jdbcType=TINYINT}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, - #{proxyId,jdbcType=VARCHAR}, #{view,jdbcType=LONGVARCHAR}) - - - insert into tb_shop_info - - - id, - - - account, - - - shop_code, - - - sub_title, - - - merchant_id, - - - shop_name, - - - chain_name, - - - back_img, - - - front_img, - - - contact_name, - - - phone, - - - logo, - - - is_deposit, - - - is_supply, - - - cover_img, - - - share_img, - - - detail, - - - lat, - - - lng, - - - mch_id, - - - register_type, - - - is_wx_ma_independent, - - - address, - - - city, - - - type, - - - industry, - - - industry_name, - - - business_time, - - - post_time, - - - post_amount_line, - - - on_sale, - - - settle_type, - - - settle_time, - - - enter_at, - - - expire_at, - - - status, - - - average, - - - order_wait_pay_minute, - - - support_device_number, - - - distribute_level, - - - created_at, - - - updated_at, - - - proxy_id, - - - view, - - - - - #{id,jdbcType=INTEGER}, - - - #{account,jdbcType=VARCHAR}, - - - #{shopCode,jdbcType=VARCHAR}, - - - #{subTitle,jdbcType=VARCHAR}, - - - #{merchantId,jdbcType=VARCHAR}, - - - #{shopName,jdbcType=VARCHAR}, - - - #{chainName,jdbcType=VARCHAR}, - - - #{backImg,jdbcType=VARCHAR}, - - - #{frontImg,jdbcType=VARCHAR}, - - - #{contactName,jdbcType=VARCHAR}, - - - #{phone,jdbcType=VARCHAR}, - - - #{logo,jdbcType=VARCHAR}, - - - #{isDeposit,jdbcType=TINYINT}, - - - #{isSupply,jdbcType=TINYINT}, - - - #{coverImg,jdbcType=VARCHAR}, - - - #{shareImg,jdbcType=VARCHAR}, - - - #{detail,jdbcType=VARCHAR}, - - - #{lat,jdbcType=VARCHAR}, - - - #{lng,jdbcType=VARCHAR}, - - - #{mchId,jdbcType=VARCHAR}, - - - #{registerType,jdbcType=VARCHAR}, - - - #{isWxMaIndependent,jdbcType=TINYINT}, - - - #{address,jdbcType=VARCHAR}, - - - #{city,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{industry,jdbcType=VARCHAR}, - - - #{industryName,jdbcType=VARCHAR}, - - - #{businessTime,jdbcType=VARCHAR}, - - - #{postTime,jdbcType=VARCHAR}, - - - #{postAmountLine,jdbcType=DECIMAL}, - - - #{onSale,jdbcType=TINYINT}, - - - #{settleType,jdbcType=TINYINT}, - - - #{settleTime,jdbcType=VARCHAR}, - - - #{enterAt,jdbcType=INTEGER}, - - - #{expireAt,jdbcType=BIGINT}, - - - #{status,jdbcType=TINYINT}, - - - #{average,jdbcType=REAL}, - - - #{orderWaitPayMinute,jdbcType=INTEGER}, - - - #{supportDeviceNumber,jdbcType=INTEGER}, - - - #{distributeLevel,jdbcType=TINYINT}, - - - #{createdAt,jdbcType=BIGINT}, - - - #{updatedAt,jdbcType=BIGINT}, - - - #{proxyId,jdbcType=VARCHAR}, - - - #{view,jdbcType=LONGVARCHAR}, - - - - - update tb_shop_info - - - account = #{account,jdbcType=VARCHAR}, - - - shop_code = #{shopCode,jdbcType=VARCHAR}, - - - sub_title = #{subTitle,jdbcType=VARCHAR}, - - - merchant_id = #{merchantId,jdbcType=VARCHAR}, - - - shop_name = #{shopName,jdbcType=VARCHAR}, - - - chain_name = #{chainName,jdbcType=VARCHAR}, - - - back_img = #{backImg,jdbcType=VARCHAR}, - - - front_img = #{frontImg,jdbcType=VARCHAR}, - - - contact_name = #{contactName,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - logo = #{logo,jdbcType=VARCHAR}, - - - is_deposit = #{isDeposit,jdbcType=TINYINT}, - - - is_supply = #{isSupply,jdbcType=TINYINT}, - - - cover_img = #{coverImg,jdbcType=VARCHAR}, - - - share_img = #{shareImg,jdbcType=VARCHAR}, - - - detail = #{detail,jdbcType=VARCHAR}, - - - lat = #{lat,jdbcType=VARCHAR}, - - - lng = #{lng,jdbcType=VARCHAR}, - - - mch_id = #{mchId,jdbcType=VARCHAR}, - - - register_type = #{registerType,jdbcType=VARCHAR}, - - - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - - - address = #{address,jdbcType=VARCHAR}, - - - city = #{city,jdbcType=VARCHAR}, - - - type = #{type,jdbcType=VARCHAR}, - - - industry = #{industry,jdbcType=VARCHAR}, - - - industry_name = #{industryName,jdbcType=VARCHAR}, - - - business_time = #{businessTime,jdbcType=VARCHAR}, - - - post_time = #{postTime,jdbcType=VARCHAR}, - - - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - - - on_sale = #{onSale,jdbcType=TINYINT}, - - - settle_type = #{settleType,jdbcType=TINYINT}, - - - settle_time = #{settleTime,jdbcType=VARCHAR}, - - - enter_at = #{enterAt,jdbcType=INTEGER}, - - - expire_at = #{expireAt,jdbcType=BIGINT}, - - - status = #{status,jdbcType=TINYINT}, - - - average = #{average,jdbcType=REAL}, - - - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - - - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - - - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - - - created_at = #{createdAt,jdbcType=BIGINT}, - - - updated_at = #{updatedAt,jdbcType=BIGINT}, - - - proxy_id = #{proxyId,jdbcType=VARCHAR}, - - - view = #{view,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_info - set account = #{account,jdbcType=VARCHAR}, - shop_code = #{shopCode,jdbcType=VARCHAR}, - sub_title = #{subTitle,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - shop_name = #{shopName,jdbcType=VARCHAR}, - chain_name = #{chainName,jdbcType=VARCHAR}, - back_img = #{backImg,jdbcType=VARCHAR}, - front_img = #{frontImg,jdbcType=VARCHAR}, - contact_name = #{contactName,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - is_deposit = #{isDeposit,jdbcType=TINYINT}, - is_supply = #{isSupply,jdbcType=TINYINT}, - cover_img = #{coverImg,jdbcType=VARCHAR}, - share_img = #{shareImg,jdbcType=VARCHAR}, - detail = #{detail,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - mch_id = #{mchId,jdbcType=VARCHAR}, - register_type = #{registerType,jdbcType=VARCHAR}, - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - address = #{address,jdbcType=VARCHAR}, - city = #{city,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - industry = #{industry,jdbcType=VARCHAR}, - industry_name = #{industryName,jdbcType=VARCHAR}, - business_time = #{businessTime,jdbcType=VARCHAR}, - post_time = #{postTime,jdbcType=VARCHAR}, - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - on_sale = #{onSale,jdbcType=TINYINT}, - settle_type = #{settleType,jdbcType=TINYINT}, - settle_time = #{settleTime,jdbcType=VARCHAR}, - enter_at = #{enterAt,jdbcType=INTEGER}, - expire_at = #{expireAt,jdbcType=BIGINT}, - status = #{status,jdbcType=TINYINT}, - average = #{average,jdbcType=REAL}, - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - proxy_id = #{proxyId,jdbcType=VARCHAR}, - view = #{view,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=INTEGER} - - - update tb_shop_info - set account = #{account,jdbcType=VARCHAR}, - shop_code = #{shopCode,jdbcType=VARCHAR}, - sub_title = #{subTitle,jdbcType=VARCHAR}, - merchant_id = #{merchantId,jdbcType=VARCHAR}, - shop_name = #{shopName,jdbcType=VARCHAR}, - chain_name = #{chainName,jdbcType=VARCHAR}, - back_img = #{backImg,jdbcType=VARCHAR}, - front_img = #{frontImg,jdbcType=VARCHAR}, - contact_name = #{contactName,jdbcType=VARCHAR}, - phone = #{phone,jdbcType=VARCHAR}, - logo = #{logo,jdbcType=VARCHAR}, - is_deposit = #{isDeposit,jdbcType=TINYINT}, - is_supply = #{isSupply,jdbcType=TINYINT}, - cover_img = #{coverImg,jdbcType=VARCHAR}, - share_img = #{shareImg,jdbcType=VARCHAR}, - detail = #{detail,jdbcType=VARCHAR}, - lat = #{lat,jdbcType=VARCHAR}, - lng = #{lng,jdbcType=VARCHAR}, - mch_id = #{mchId,jdbcType=VARCHAR}, - register_type = #{registerType,jdbcType=VARCHAR}, - is_wx_ma_independent = #{isWxMaIndependent,jdbcType=TINYINT}, - address = #{address,jdbcType=VARCHAR}, - city = #{city,jdbcType=VARCHAR}, - type = #{type,jdbcType=VARCHAR}, - industry = #{industry,jdbcType=VARCHAR}, - industry_name = #{industryName,jdbcType=VARCHAR}, - business_time = #{businessTime,jdbcType=VARCHAR}, - post_time = #{postTime,jdbcType=VARCHAR}, - post_amount_line = #{postAmountLine,jdbcType=DECIMAL}, - on_sale = #{onSale,jdbcType=TINYINT}, - settle_type = #{settleType,jdbcType=TINYINT}, - settle_time = #{settleTime,jdbcType=VARCHAR}, - enter_at = #{enterAt,jdbcType=INTEGER}, - expire_at = #{expireAt,jdbcType=BIGINT}, - status = #{status,jdbcType=TINYINT}, - average = #{average,jdbcType=REAL}, - order_wait_pay_minute = #{orderWaitPayMinute,jdbcType=INTEGER}, - support_device_number = #{supportDeviceNumber,jdbcType=INTEGER}, - distribute_level = #{distributeLevel,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=BIGINT}, - updated_at = #{updatedAt,jdbcType=BIGINT}, - proxy_id = #{proxyId,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - + + id + , account, shop_code, sub_title, merchant_id, shop_name, chain_name, back_img, front_img, contact_name, phone, logo, is_deposit, is_supply, cover_img, share_img, view, detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, industry, industry_name, business_start_day, business_end_day, business_time, post_time, post_amount_line, on_sale, settle_type, settle_time, enter_at, expire_at, status, average, order_wait_pay_minute, support_device_number, distribute_level, created_at, updated_at, proxy_id, profiles, shop_qrcode, tag, is_open_yhq, is_use_vip, provinces, cities, districts, is_custom, is_return, is_member_in, is_member_return, is_table_fee, is_member_price, consume_colony, table_fee, eat_model, small_qrcode, payment_qrcode - + select + + + from tb_shop_info + where id = #{id} - + select + + + from tb_shop_info + + + + + - SELECT - * - FROM - tb_shop_info t - WHERE - ( - FROM_UNIXTIME( t.created_at / 1000 ) BETWEEN NOW() - INTERVAL 15 MINUTE - AND NOW()) - OR ( - FROM_UNIXTIME( t.updated_at / 1000 ) BETWEEN NOW() - INTERVAL 15 MINUTE - AND NOW()); - - \ No newline at end of file