多余内容删除

充值会员优惠券赠送
店铺信息增加字段

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,

src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeColumnConfigMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/CodeGenConfigMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntAppMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDatabaseMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployHistoryMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntDeployServerMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/MntServerMapper.java

@@ -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);
-}

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<TbActivateInRecord> queryAll(TbActivateInRecord tbActivateInRecord, @Param("pageable") Pageable pageable);
+
+
+    /**
+     * 新增数据
+     *
+     * @param tbActivateInRecord 实例对象
+     * @return 影响行数
+     */
+    int insert(TbActivateInRecord tbActivateInRecord);
+
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<TbActivateInRecord> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TbActivateInRecord> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tbActivateInRecord 实例对象
+     * @return 影响行数
+     */
+    int update(TbActivateInRecord tbActivateInRecord);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

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<TbActivate> 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<TbActivate> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TbActivate> 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);
-}
+}
+

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<TbActivateOutRecord> queryAll(TbActivateOutRecord tbActivateOutRecord, @Param("pageable") Pageable pageable);
+
+
+    /**
+     * 新增数据
+     *
+     * @param tbActivateOutRecord 实例对象
+     * @return 影响行数
+     */
+    int insert(TbActivateOutRecord tbActivateOutRecord);
+
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<TbActivateOutRecord> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TbActivateOutRecord> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tbActivateOutRecord 实例对象
+     * @return 影响行数
+     */
+    int update(TbActivateOutRecord tbActivateOutRecord);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

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<TbCouponProduct> queryAll(TbCouponProduct tbCouponProduct, @Param("pageable") Pageable pageable);
+
+    List<TbCouponProduct> queryAllByCouponId(Integer couponId);
+
+    /**
+     * 新增数据
+     *
+     * @param tbCouponProduct 实例对象
+     * @return 影响行数
+     */
+    int insert(TbCouponProduct tbCouponProduct);
+
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<TbCouponProduct> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TbCouponProduct> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tbCouponProduct 实例对象
+     * @return 影响行数
+     */
+    int update(TbCouponProduct tbCouponProduct);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbDeviceOperateInfoMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussDeviceGoodsMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbReceiptSalesMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbRenewalsPayLogMapper.java

@@ -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);
-}

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCashSpreadMapper.java

@@ -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);
-}

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<TbShopCoupon> queryAll(TbShopCoupon tbShopCoupon, @Param("pageable") Pageable pageable);
+
+
+    /**
+     * 新增数据
+     *
+     * @param tbShopCoupon 实例对象
+     * @return 影响行数
+     */
+    int insert(TbShopCoupon tbShopCoupon);
+
+    /**
+     * 批量新增数据（MyBatis原生foreach方法）
+     *
+     * @param entities List<TbShopCoupon> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TbShopCoupon> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param tbShopCoupon 实例对象
+     * @return 影响行数
+     */
+    int update(TbShopCoupon tbShopCoupon);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopCurrencyMapper.java

@@ -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);
-}

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<TbShopInfo> selectAll();
 
     List<TbShopInfo> selectAllByCreateTime();

src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeColumnConfig.java

@@ -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();
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/CodeGenConfig.java

@@ -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();
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntApp.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDatabase.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeploy.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployHistory.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntDeployServerKey.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/MntServer.java

@@ -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;
-    }
-}

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;
     }
-}
+
+    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;
+    }
+
+}
+

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;
+    }
+
+}
+

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;
+    }
+
+}
+

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;
+    }
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbDeviceOperateInfo.java

@@ -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();
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlussDeviceGoods.java

@@ -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();
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbReceiptSales.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbRenewalsPayLog.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpread.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCashSpreadWithBLOBs.java

@@ -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();
-    }
-}

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;
+    }
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrency.java

@@ -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;
-    }
-}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopCurrencyWithBLOBs.java

@@ -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();
-    }
-}

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;
-
-
 }
+

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<TbActivateInRecord> 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<TbCouponProduct> 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;
         });
 

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();
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/task/ShopInfoStatusTask.java

@@ -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<String, TbShopInfo> concurrentHashMap= DataCache.concurrentHashMap;
-
-        Enumeration<String>  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;
-        }
-
-    }
-
-
-}