fix 主键id类型修改为long 以及部分相关修改

fuintBackend/fuint-application/src/main/java/com/fuint/common/aspect/TActionLogAop.java

@@ -53,8 +53,8 @@ public class TActionLogAop {
     private AccountService tAccountService;
 
     private String userName = ""; // 用户名
-    private Integer merchantId = 0; // 商户ID
-    private Integer storeId = 0; // 店铺ID
+    private Long merchantId = 0L; // 商户ID
+    private Long storeId = 0L; // 店铺ID
     private Long startTimeMillis = 0l; // 开始时间
     private Long endTimeMillis = 0l; // 结束时间
     private String clientIp = "";

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 public class AccountDto {
 
     @ApiModelProperty("账户主键id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("账户编码")
     private String accountKey;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java

@@ -16,7 +16,7 @@ import java.util.Date;
 public class AccountInfo implements Serializable {
 
     @ApiModelProperty("账户主键id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("账户编码")
     private String accountKey;
@@ -54,19 +54,19 @@ public class AccountInfo implements Serializable {
     private String realName;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("所属商户名称")
     private String merchantName;
 
     @ApiModelProperty("所属店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("所属店铺名称")
     private String storeName;
 
     @ApiModelProperty("关联员工ID")
-    private Integer staffId;
+    private Long staffId;
 
     @ApiModelProperty("登录的Token")
     private String token;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AddressDto.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class AddressDto implements Serializable {
 
     @ApiModelProperty("账户主键ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ArticleDto.java

@@ -12,7 +12,7 @@ public class ArticleDto implements Serializable {
     /**
     * 自增ID 
     */
-    private Integer id;
+    private Long id;
 
    /**
     * 标题 
@@ -79,10 +79,10 @@ public class ArticleDto implements Serializable {
      * */
     private Integer sort;
 
-    public Integer getId(){
+    public Long getId(){
         return id;
     }
-    public void setId(Integer id){
+    public void setId(Long id){
     this.id=id;
     }
     public String getTitle(){

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/BalanceDto.java

@@ -21,7 +21,7 @@ import java.util.Date;
 public class BalanceDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/BannerDto.java

@@ -19,7 +19,7 @@ import java.util.Date;
 public class BannerDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("标题")
     private String title;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/BookDto.java

@@ -20,8 +20,8 @@ public class BookDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("预约名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/BookItemDto.java

@@ -19,7 +19,7 @@ public class BookItemDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/CommissionCashDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 public class CommissionCashDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("结算单号")
     private String settleNo;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/CommissionLogDto.java

@@ -19,7 +19,7 @@ import java.util.Date;
 public class CommissionLogDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("分佣类型")
     private String type;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/CommissionRelationDto.java

@@ -16,7 +16,7 @@ import java.util.Date;
 public class CommissionRelationDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/CommissionRuleDto.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class CommissionRuleDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("规则名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ConfirmLogDto.java

@@ -23,7 +23,7 @@ import java.util.Date;
 public class ConfirmLogDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("核销编码")
     private String code;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/CouponDto.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 public class CouponDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("卡券名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GiveDto.java

@@ -19,7 +19,7 @@ import java.math.BigDecimal;
 public class GiveDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("获赠者会员ID")
     private Integer userId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GiveItemDto.java

@@ -20,7 +20,7 @@ import java.util.Date;
 public class GiveItemDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("赠予对象手机号")
     private String mobile;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsCateDto.java

@@ -19,7 +19,7 @@ import lombok.Setter;
 public class GoodsCateDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsDto.java

@@ -25,7 +25,7 @@ import java.util.List;
 public class GoodsDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsSkuDto.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
 public class GoodsSkuDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("sku编码")
     private String skuNo;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecChildDto.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class GoodsSpecChildDto implements Serializable {
 
    @ApiModelProperty("自增ID")
-   private Integer id;
+   private Long id;
 
    @ApiModelProperty("规格名称")
    private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsSpecItemDto.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class GoodsSpecItemDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("规格名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GoodsTopDto.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 public class GoodsTopDto implements Serializable {
 
     @ApiModelProperty("商品ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商品名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/GroupMemberDto.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class GroupMemberDto implements Serializable {
 
     @ApiModelProperty("会员ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/MaterialTypeDto.java

@@ -11,7 +11,7 @@ import lombok.Data;
 public class MaterialTypeDto {
 
 	@ApiModelProperty("id")
-	@TableId(value = "ID", type = IdType.AUTO)
+	@TableId(value = "ID", type = IdType.ID_WORKER)
 	private Long id;
 
 	@ApiModelProperty("类型名称")

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/MemberGroupDto.java

@@ -19,7 +19,7 @@ public class MemberGroupDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("分组ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("分组名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/MemberTopDto.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 public class MemberTopDto implements Serializable {
 
     @ApiModelProperty("会员ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/MyCouponDto.java

@@ -21,7 +21,7 @@ import java.util.Date;
 public class MyCouponDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("卡券名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/OpenGiftDto.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 public class OpenGiftDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("店铺信息")
     private MtStore storeInfo;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/OrderDto.java

@@ -19,7 +19,7 @@ import java.util.Date;
 public class OrderDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("订单类型")
     private String type;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/OrderGoodsDto.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class OrderGoodsDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商品ID")
     private Integer goodsId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/OrderUserDto.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class OrderUserDto implements Serializable {
 
     @ApiModelProperty("会员ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员号")
     private String no;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/PointDto.java

@@ -19,7 +19,7 @@ import java.util.Date;
 public class PointDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/RefundDto.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class RefundDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("订单ID")
     private Integer orderId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/RegionDto.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class RegionDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ReqCouponDto.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 public class ReqCouponDto implements Serializable {
 
     @ApiModelProperty("卡券ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ReqCouponGroupDto.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 public class ReqCouponGroupDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ReqSendLogDto.java

@@ -18,7 +18,7 @@ import java.util.Date;
 public class ReqSendLogDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/ResCartDto.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class ResCartDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/SettlementDto.java

@@ -19,7 +19,7 @@ import lombok.Setter;
 public class SettlementDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("结算单号")
     private String settlementNo;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/SettlementOrderDto.java

@@ -17,7 +17,7 @@ import lombok.Setter;
 public class SettlementOrderDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("结算ID")
     private Integer settlementId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/SmsTemplateDto.java

@@ -18,7 +18,7 @@ import java.util.Date;
 public class SmsTemplateDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/StaffDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 public class StaffDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("员工类别")
     private Integer category;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/StoreDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 public class StoreDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/UserCouponDto.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class UserCouponDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("卡券名称")
     private String name;
@@ -32,7 +32,7 @@ public class UserCouponDto implements Serializable {
     private String status;
 
     @ApiModelProperty("卡券ID")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty("使用规则")
     private String useRule;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/UserDto.java

@@ -20,7 +20,7 @@ import lombok.Setter;
 public class UserDto implements Serializable {
 
     @ApiModelProperty("会员ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("会员号")
     private String userNo;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/UserGroupDto.java

@@ -18,7 +18,7 @@ import lombok.Setter;
 public class UserGroupDto implements Serializable {
 
     @ApiModelProperty("分组ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("分组名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/UserInfo.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class UserInfo implements Serializable {
 
     @ApiModelProperty("会员ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("登录Token")
     private String token;

fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/UserOrderDto.java

@@ -23,10 +23,10 @@ import java.util.List;
 public class UserOrderDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("订单号")
     private String orderSn;
@@ -47,10 +47,10 @@ public class UserOrderDto implements Serializable {
     private Boolean isVerify;
 
     @ApiModelProperty("卡券ID")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("是否游客")
     private String isVisitor;
@@ -59,7 +59,7 @@ public class UserOrderDto implements Serializable {
     private String verifyCode;
 
     @ApiModelProperty("员工ID")
-    private Integer staffId;
+    private Long staffId;
 
     @ApiModelProperty("总金额")
     private BigDecimal amount;
@@ -74,7 +74,7 @@ public class UserOrderDto implements Serializable {
     private BigDecimal deliveryFee;
 
     @ApiModelProperty("使用积分")
-    private Integer usePoint;
+    private Long usePoint;
 
     @ApiModelProperty("积分金额")
     private BigDecimal pointAmount;

fuintBackend/fuint-application/src/main/java/com/fuint/common/param/CommissionRuleParam.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class CommissionRuleParam implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("规则名称")
     private String name;

fuintBackend/fuint-application/src/main/java/com/fuint/common/permission/PermissionService.java

@@ -51,7 +51,7 @@ public class PermissionService {
 
         Set<String> allPermission = new HashSet<>();
 
-        List<TSource> sources = sourceService.getMenuListByUserId(accountInfo.getMerchantId(), Math.toIntExact(accountInfo.getId()));
+        List<TSource> sources = sourceService.getMenuListByUserId(accountInfo.getMerchantId(), accountInfo.getId());
         if (sources != null && !sources.isEmpty()) {
             for (TSource tSource : sources) {
                 allPermission.add(tSource.getPath().replaceAll("/", ":"));

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java

@@ -42,7 +42,7 @@ public interface AccountService extends IService<TAccount> {
      * @param id 账号ID
      * @return
      */
-    TAccount getAccountInfoById(Integer id);
+    TAccount getAccountInfoById(Long id);
 
     /**
      * 创建账号信息
@@ -59,7 +59,7 @@ public interface AccountService extends IService<TAccount> {
      * @param accountId 账号ID
      * @return
      * */
-    List<Long> getRoleIdsByAccountId(Integer accountId);
+    List<Long> getRoleIdsByAccountId(Long accountId);
 
     /**
      * 修改账户
@@ -76,7 +76,7 @@ public interface AccountService extends IService<TAccount> {
      * @param accountId 账户
      * @return 角色ID集合
      */
-    List<Integer> getDutyIdsByAccountId(Integer accountId);
+    List<Integer> getDutyIdsByAccountId(Long accountId);
 
     /**
      * 更新账户信息

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/CouponService.java

@@ -45,7 +45,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      */
-    MtCoupon queryCouponById(Integer id) throws BusinessCheckException;
+    MtCoupon queryCouponById(Long id) throws BusinessCheckException;
 
     /**
      * 删除卡券信息
@@ -76,7 +76,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      */
-    void sendCoupon(Integer couponId, Integer userId, Integer num, Boolean sendMessage, String uuid, String operator) throws BusinessCheckException;
+    void sendCoupon(Long couponId, Long userId, Integer num, Boolean sendMessage, String uuid, String operator) throws BusinessCheckException;
 
     /**
      * 发放卡券

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/DutyService.java

@@ -33,7 +33,7 @@ public interface DutyService extends IService<TDuty> {
      * @param accountId  账号ID
      * @return
      */
-    List<TDuty> getAvailableRoles(Integer merchantId, Integer accountId);
+    List<TDuty> getAvailableRoles(Long merchantId, Long accountId);
 
     /**
      * 根据ID获取角色实体
@@ -66,7 +66,7 @@ public interface DutyService extends IService<TDuty> {
      * @param dutyId 角色ID
      * @return
      */
-    void deleteDuty(Integer merchantId, long dutyId) throws BusinessCheckException;
+    void deleteDuty(Long merchantId, long dutyId) throws BusinessCheckException;
 
     /**
      * 更新状态
@@ -75,7 +75,7 @@ public interface DutyService extends IService<TDuty> {
      * @param dutyStatusRequest
      * @return
      */
-    void updateStatus(Integer merchantId, DutyStatusRequest dutyStatusRequest) throws BusinessCheckException;
+    void updateStatus(Long merchantId, DutyStatusRequest dutyStatusRequest) throws BusinessCheckException;
 
     /**
      * 修改角色
@@ -93,7 +93,7 @@ public interface DutyService extends IService<TDuty> {
      * @param name 角色名称
      * @return
      */
-    TDuty findByName(Integer merchantId, String name);
+    TDuty findByName(Long merchantId, String name);
 
     /**
      * 根据角色名称获取已经分配的菜单ID集合
@@ -109,7 +109,7 @@ public interface DutyService extends IService<TDuty> {
      * @param merchantId 商户ID
      * @return
      */
-    List<TreeNode> getDutyTree(Integer merchantId);
+    List<TreeNode> getDutyTree(Long merchantId);
 
     /**
      * 根据账户获取角色
@@ -117,5 +117,5 @@ public interface DutyService extends IService<TDuty> {
      * @param accountId 账号ID
      * @return
      */
-    List<Long> findDutiesByAccountId(Integer accountId);
+    List<Long> findDutiesByAccountId(Long accountId);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/MerchantService.java

@@ -40,7 +40,7 @@ public interface MerchantService extends IService<MtMerchant> {
      * @throws BusinessCheckException
      * @return
      */
-    MtMerchant queryMerchantById(Integer id) throws BusinessCheckException;
+    MtMerchant queryMerchantById(Long id) throws BusinessCheckException;
 
     /**
      * 根据名称获取商户信息
@@ -76,7 +76,7 @@ public interface MerchantService extends IService<MtMerchant> {
      * @throws BusinessCheckException
      * @return
      */
-    void updateStatus(Integer id, String operator, String status) throws BusinessCheckException;
+    void updateStatus(Long id, String operator, String status) throws BusinessCheckException;
 
     /**
      * 根据条件查询商户

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SettingService.java

@@ -22,7 +22,7 @@ public interface SettingService extends IService<MtSetting> {
      * @param  name 配置名称
      * @throws BusinessCheckException
      */
-    void removeSetting(Integer merchantId, String type, String name) throws BusinessCheckException;
+    void removeSetting(Long merchantId, String type, String name) throws BusinessCheckException;
 
     /**
      * 保存配置
@@ -38,7 +38,7 @@ public interface SettingService extends IService<MtSetting> {
      * @param  type
      * @throws BusinessCheckException
      */
-    List<MtSetting> getSettingList(Integer merchantId, String type) throws BusinessCheckException;
+    List<MtSetting> getSettingList(Long merchantId, String type) throws BusinessCheckException;
 
     /**
      * 根据配置名称获取配置信息
@@ -48,7 +48,7 @@ public interface SettingService extends IService<MtSetting> {
      * @param  name 配置名称
      * @throws BusinessCheckException
      */
-    MtSetting querySettingByName(Integer merchantId, String type, String name) throws BusinessCheckException;
+    MtSetting querySettingByName(Long merchantId, String type, String name) throws BusinessCheckException;
 
     /**
      * 根据配置名称获取配置信息
@@ -59,7 +59,7 @@ public interface SettingService extends IService<MtSetting> {
      * @param  name 配置名称
      * @throws BusinessCheckException
      */
-    MtSetting querySettingByName(Integer merchantId, Integer storeId, String type, String name) throws BusinessCheckException;
+    MtSetting querySettingByName(Long merchantId, Long storeId, String type, String name) throws BusinessCheckException;
 
     /**
      * 获取系统上传文件的根路径

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java

@@ -50,7 +50,7 @@ public interface SourceService extends IService<TSource> {
      * @throws BusinessCheckException
      * @return
      */
-    List<TSource> getMenuListByUserId(Integer merchantId, Integer accountId) throws BusinessCheckException;
+    List<TSource> getMenuListByUserId(Long merchantId, Long accountId) throws BusinessCheckException;
 
     /**
      * 构建前端路由所需要的菜单
@@ -83,7 +83,7 @@ public interface SourceService extends IService<TSource> {
      * @param accountId
      * @return
      */
-    void addSource(TSource tSource, Integer accountId);
+    void addSource(TSource tSource, Long accountId);
 
     /**
      * 修改后台菜单

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StaffService.java

@@ -41,7 +41,7 @@ public interface StaffService extends IService<MtStaff> {
      * @param  id 员工id
      * @throws BusinessCheckException
      */
-    MtStaff queryStaffById(Integer id) throws BusinessCheckException;
+    MtStaff queryStaffById(Long id) throws BusinessCheckException;
 
     /**
      * 审核更改状态(禁用，审核通过)
@@ -50,7 +50,7 @@ public interface StaffService extends IService<MtStaff> {
      * @throws BusinessCheckException
      * @return
      */
-    Integer updateAuditedStatus(Integer id, String statusEnum) throws BusinessCheckException;
+    Integer updateAuditedStatus(Long id, String statusEnum) throws BusinessCheckException;
 
     /**
      * 根据条件搜索员工

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/StoreService.java

@@ -48,7 +48,7 @@ public interface StoreService extends IService<MtStore> {
      * @throws BusinessCheckException
      * @return
      */
-    MtStore queryStoreById(Integer id) throws BusinessCheckException;
+    MtStore queryStoreById(Long id) throws BusinessCheckException;
 
     /**
      * 根据店铺名称获取店铺信息
@@ -65,7 +65,7 @@ public interface StoreService extends IService<MtStore> {
      * @return
      * @throws BusinessCheckException
      */
-    StoreDto queryStoreDtoById(Integer id) throws BusinessCheckException;
+    StoreDto queryStoreDtoById(Long id) throws BusinessCheckException;
 
     /**
      * 更新店铺状态
@@ -75,7 +75,7 @@ public interface StoreService extends IService<MtStore> {
      * @param  status   状态
      * @throws BusinessCheckException
      */
-    void updateStatus(Integer id, String operator, String status) throws BusinessCheckException;
+    void updateStatus(Long id, String operator, String status) throws BusinessCheckException;
 
     /**
      * 根据条件查询店铺列表

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/TableService.java

@@ -42,7 +42,7 @@ public interface TableService extends IService<MtTable> {
      * @throws BusinessCheckException
      * @return
      */
-    MtTable queryTableById(Integer id) throws BusinessCheckException;
+    MtTable queryTableById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID删除桌码
@@ -52,7 +52,7 @@ public interface TableService extends IService<MtTable> {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteTable(Integer id, String operator) throws BusinessCheckException;
+    void deleteTable(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 更新桌码

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/UserCouponService.java

@@ -49,7 +49,7 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param status
      * @return
      * */
-    List<MtUserCoupon> getUserCouponList(Integer userId, List<String> status) throws BusinessCheckException;
+    List<MtUserCoupon> getUserCouponList(Long userId, List<String> status) throws BusinessCheckException;
 
     /**
      * 获取用户的卡券
@@ -66,14 +66,14 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param useFor 用途
      * @return
      * */
-    List<CouponDto> getPayAbleCouponList(Integer userId, Integer storeId, String useFor) throws BusinessCheckException;
+    List<CouponDto> getPayAbleCouponList(Long userId, Long storeId, String useFor) throws BusinessCheckException;
 
     /**
      * 获取会员卡券详情
      * @param userId
      * @param couponId
      * */
-    List<MtUserCoupon> getUserCouponDetail(Integer userId, Integer couponId) throws BusinessCheckException;
+    List<MtUserCoupon> getUserCouponDetail(Long userId, Long couponId) throws BusinessCheckException;
 
     /**
      * 获取会员卡券详情
@@ -81,7 +81,7 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param userCouponId
      * @return
      * */
-    MtUserCoupon getUserCouponDetail(Integer userCouponId) throws BusinessCheckException;
+    MtUserCoupon getUserCouponDetail(Long userCouponId) throws BusinessCheckException;
 
     /**
      * 根据过期时间查询会员卡券
@@ -92,7 +92,7 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param endTime
      * @return
      * */
-    List<MtUserCoupon> getUserCouponListByExpireTime(Integer userId, String status, String startTime, String endTime) throws BusinessCheckException;
+    List<MtUserCoupon> getUserCouponListByExpireTime(Long userId, String status, String startTime, String endTime) throws BusinessCheckException;
 
     /**
      * 给会员发送卡券（会员购买）
@@ -104,5 +104,5 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param num 购买数量
      * @return
      * */
-    boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile, Integer num) throws BusinessCheckException;
+    boolean buyCouponItem(Long orderId, Long couponId, Long userId, String mobile, Integer num) throws BusinessCheckException;
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/WeixinService.java

@@ -27,7 +27,7 @@ public interface WeixinService {
      * @param useCache 是否从缓存中读取
      * @return
      * */
-    String getAccessToken(Integer merchantId, boolean isMinApp, boolean useCache) throws BusinessCheckException;
+    String getAccessToken(Long merchantId, boolean isMinApp, boolean useCache) throws BusinessCheckException;
 
     /**
      * 提交预支付订单
@@ -68,7 +68,7 @@ public interface WeixinService {
      * @param code 登录编码
      * @return
      * */
-    JSONObject getWxProfile(Integer merchantId, String code) throws BusinessCheckException;
+    JSONObject getWxProfile(Long merchantId, String code) throws BusinessCheckException;
 
     /**
      * 获取微信openId
@@ -77,7 +77,7 @@ public interface WeixinService {
      * @param code 登录编码
      * @return
      * */
-    JSONObject getWxOpenId(Integer merchantId, String code) throws BusinessCheckException;
+    JSONObject getWxOpenId(Long merchantId, String code) throws BusinessCheckException;
 
     /**
      * 获取会员微信绑定的手机号
@@ -101,7 +101,7 @@ public interface WeixinService {
      * @param sendTime 发送时间
      * @return
      * */
-    Boolean sendSubscribeMessage(Integer merchantId, Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException;
+    Boolean sendSubscribeMessage(Long merchantId, Long userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException;
 
     /**
      * 发送订阅消息
@@ -110,7 +110,7 @@ public interface WeixinService {
      * @param reqDataJsonStr 发送参数
      * @return
      * */
-    Boolean doSendSubscribeMessage(Integer merchantId, String reqDataJsonStr);
+    Boolean doSendSubscribeMessage(Long merchantId, String reqDataJsonStr);
 
     /**
      * 查询支付订单
@@ -120,7 +120,7 @@ public interface WeixinService {
      * @param orderSn 订单号
      * @return
      * */
-    Map<String, String> queryPaidOrder(Integer storeId, String transactionId, String orderSn);
+    Map<String, String> queryPaidOrder(Long storeId, String transactionId, String orderSn);
 
     /**
      * 发起售后
@@ -132,7 +132,7 @@ public interface WeixinService {
      * @param platform 平台
      * @return
      * */
-    Boolean doRefund(Integer storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException;
+    Boolean doRefund(Long storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException;
 
     /**
      * 生成二维码
@@ -144,7 +144,7 @@ public interface WeixinService {
      * @param width 宽度
      * @return
      * */
-    String createQrCode(Integer merchantId, String type, Integer id, String page, Integer width) throws BusinessCheckException;
+    String createQrCode(Long merchantId, String type, Long id, String page, Integer width) throws BusinessCheckException;
 
     /**
      * 开通微信卡券
@@ -153,7 +153,7 @@ public interface WeixinService {
      * @param wxCardId 微信会员卡ID
      * @return
      * */
-    String createWxCard(Integer merchantId, String wxCardId) throws BusinessCheckException;
+    String createWxCard(Long merchantId, String wxCardId) throws BusinessCheckException;
 
     /**
      * 创建微信卡券领取的二维码
@@ -163,7 +163,7 @@ public interface WeixinService {
      * @param code 会员卡编码
      * @return
      * */
-    String createCardQrCode(Integer merchantId, String cardId, String code);
+    String createCardQrCode(Long merchantId, String cardId, String code);
 
     /**
      * 是否已领取卡券
@@ -173,7 +173,7 @@ public interface WeixinService {
      * @param openId openId
      * @return
      * */
-    Boolean isOpenCard(Integer merchantId, String cardId, String openId);
+    Boolean isOpenCard(Long merchantId, String cardId, String openId);
 
     /**
      * 生成小程序链接
@@ -182,6 +182,6 @@ public interface WeixinService {
      * @param path 页面路径
      * @return
      * */
-    String createMiniAppLink(Integer merchantId, String path);
+    String createMiniAppLink(Long merchantId, String path);
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java

@@ -180,7 +180,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
      * @return
      * */
     @Override
-    public TAccount getAccountInfoById(Integer userId) {
+    public TAccount getAccountInfoById(Long userId) {
         TAccount tAccount = tAccountMapper.selectById(userId);
         return tAccount;
     }
@@ -201,7 +201,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         account.setRealName(tAccount.getRealName());
         account.setRoleIds(tAccount.getRoleIds());
         account.setStaffId(tAccount.getStaffId());
-        Integer storeId = tAccount.getStoreId() == null ? 0 : tAccount.getStoreId();
+        Long storeId = tAccount.getStoreId() == null ? 0 : tAccount.getStoreId();
         if (tAccount.getMerchantId() == null || tAccount.getMerchantId() <= 0) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null) {
@@ -216,7 +216,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         account.setStaffId(tAccount.getStaffId());
         account.setPassword(tAccount.getPassword());
         this.entryptPassword(account);
-        int id = tAccountMapper.insert(account);
+        long id = tAccountMapper.insert(account);
 
         if (id > 0 && duties != null && duties.size() > 0) {
             for (TDuty tDuty : duties) {
@@ -241,7 +241,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
      * @return
      * */
     @Override
-    public List<Long> getRoleIdsByAccountId(Integer accountId) {
+    public List<Long> getRoleIdsByAccountId(Long accountId) {
         List<Long> roleIds = tDutyMapper.getRoleIdsByAccountId(accountId);
         return roleIds;
     }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AlipayServiceImpl.java

@@ -138,7 +138,7 @@ public class AlipayServiceImpl implements AlipayService {
     @Override
     public Boolean checkCallBack(Map<String, String> params) throws Exception {
         String orderSn = params.get("out_trade_no") != null ? params.get("out_trade_no") : "";
-        Integer storeId = 0;
+        Long storeId = 0L;
         UserOrderDto orderDto = orderService.getOrderByOrderSn(orderSn);
         if (orderDto != null && orderDto.getStoreInfo() != null) {
             storeId = orderDto.getStoreInfo().getId();
@@ -153,7 +153,7 @@ public class AlipayServiceImpl implements AlipayService {
      * @param storeId 店铺ID
      * @return
      * */
-    public AliPayApiConfig getApiConfig(Integer storeId) throws BusinessCheckException {
+    public AliPayApiConfig getApiConfig(Long storeId) throws BusinessCheckException {
         AliPayApiConfig aliPayApiConfig;
         String appId = aliPayBean.getAppId();
         String privateKey = aliPayBean.getPrivateKey();
@@ -191,7 +191,7 @@ public class AlipayServiceImpl implements AlipayService {
      * @return
      * */
     @Override
-    public Map<String, String> queryPaidOrder(Integer storeId, String tradeNo, String orderSn) throws BusinessCheckException {
+    public Map<String, String> queryPaidOrder(Long storeId, String tradeNo, String orderSn) throws BusinessCheckException {
         try {
             AlipayTradeQueryModel model = new AlipayTradeQueryModel();
             if (StringUtil.isNotEmpty(orderSn)) {

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -52,7 +52,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      * @return
      */
     @Override
-    public List<TDuty> getAvailableRoles(Integer merchantId, Integer accountId) {
+    public List<TDuty> getAvailableRoles(Long merchantId, Long accountId) {
         List<TDuty> result = tDutyMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
         List<Long> ids = new ArrayList<>();
         if (result != null && result.size() > 0) {
@@ -106,12 +106,12 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "删除后台角色")
-    public void deleteDuty(Integer merchantId, long dutyId) {
+    public void deleteDuty(Long merchantId, long dutyId) {
         TDuty tDuty = getRoleById(dutyId);
         if (!merchantId.equals(tDuty.getMerchantId()) && merchantId > 0) {
             throw new BusinessRuntimeException("抱歉，您没有删除的权限");
         }
-        tDutySourceMapper.deleteSourcesByDutyId((int) dutyId);
+        tDutySourceMapper.deleteSourcesByDutyId(dutyId);
         tDutyMapper.deleteById(dutyId);
     }
 
@@ -125,7 +125,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "更新后台角色状态")
-    public void updateStatus(Integer merchantId, DutyStatusRequest dutyStatusRequest) throws BusinessCheckException {
+    public void updateStatus(Long merchantId, DutyStatusRequest dutyStatusRequest) throws BusinessCheckException {
         TDuty tDuty = tDutyMapper.selectById(dutyStatusRequest.getRoleId());
 
         if (!merchantId.equals(tDuty.getMerchantId()) && merchantId > 0) {
@@ -187,7 +187,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      * @return
      */
     @Override
-    public TDuty findByName(Integer merchantId, String name) {
+    public TDuty findByName(Long merchantId, String name) {
         return tDutyMapper.findByName(merchantId, name);
     }
 
@@ -274,7 +274,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      * @return
      */
     @Override
-    public List<TreeNode> getDutyTree(Integer merchantId) {
+    public List<TreeNode> getDutyTree(Long merchantId) {
         List<TDuty> tDuties = getAvailableRoles(merchantId, 0);
         List<TreeNode> trees = new ArrayList<TreeNode>();
         if (tDuties != null && tDuties.size() > 0) {
@@ -298,7 +298,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      * @return
      */
     @Override
-    public List<Long> findDutiesByAccountId(Integer accountId) {
+    public List<Long> findDutiesByAccountId(Long accountId) {
         return tDutyMapper.getRoleIdsByAccountId(accountId);
     }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -113,7 +113,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public String getAccessToken(Integer merchantId, boolean isMinApp, boolean useCache) throws BusinessCheckException {
+    public String getAccessToken(Long merchantId, boolean isMinApp, boolean useCache) throws BusinessCheckException {
         String platForm = isMinApp == true ? "minApp" : "mp";
         String wxAppId = env.getProperty("weixin.official.appId");
         String wxAppSecret = env.getProperty("weixin.official.appSecret");
@@ -262,7 +262,7 @@ public class WeixinServiceImpl implements WeixinService {
             String orderSn = result.get("out_trade_no");
             logger.info("支付通知，xml = {}, orderSn = {}", xmlMsg, orderSn);
 
-            Integer storeId = 0;
+            Long storeId = 0L;
             String platform = PlatformTypeEnum.MP_WEIXIN.getCode();
             if (StringUtil.isNotEmpty(orderSn)) {
                 MtOrder mtOrder = orderService.getOrderInfoByOrderSn(orderSn);
@@ -328,7 +328,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public JSONObject getWxProfile(Integer merchantId, String code) throws BusinessCheckException {
+    public JSONObject getWxProfile(Long merchantId, String code) throws BusinessCheckException {
         String wxAppId = env.getProperty("wxpay.appId");
         String wxAppSecret = env.getProperty("wxpay.appSecret");
 
@@ -366,7 +366,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public JSONObject getWxOpenId(Integer merchantId, String code) throws BusinessCheckException {
+    public JSONObject getWxOpenId(Long merchantId, String code) throws BusinessCheckException {
         String wxAppId = env.getProperty("weixin.official.appId");
         String wxAppSecret = env.getProperty("weixin.official.appSecret");
 
@@ -455,7 +455,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Boolean sendSubscribeMessage(Integer merchantId, Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException {
+    public Boolean sendSubscribeMessage(Long merchantId, Long userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException {
         if (StringUtil.isEmpty(toUserOpenId) || StringUtil.isEmpty(key) || userId < 1) {
             return false;
         }
@@ -534,7 +534,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Boolean doSendSubscribeMessage(Integer merchantId, String reqDataJsonStr) {
+    public Boolean doSendSubscribeMessage(Long merchantId, String reqDataJsonStr) {
         try {
             String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + getAccessToken(merchantId, true,true);
             String response = HttpRESTDataClient.requestPost(url, "application/json; charset=utf-8", reqDataJsonStr);
@@ -566,7 +566,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Map<String, String> queryPaidOrder(Integer storeId, String transactionId, String orderSn) {
+    public Map<String, String> queryPaidOrder(Long storeId, String transactionId, String orderSn) {
         try {
             MtOrder mtOrder = orderService.getOrderInfoByOrderSn(orderSn);
             String platform = PlatformTypeEnum.MP_WEIXIN.getCode();
@@ -609,7 +609,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Boolean doRefund(Integer storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException {
+    public Boolean doRefund(Long storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException {
         try {
             logger.info("WeixinService.doRefund orderSn = {}, totalFee = {}, refundFee = {}", orderSn, totalAmount, refundAmount);
             if (StringUtil.isEmpty(orderSn)) {
@@ -667,7 +667,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public String createQrCode(Integer merchantId, String type, Integer id, String page, Integer width) throws BusinessCheckException {
+    public String createQrCode(Long merchantId, String type, Long id, String page, Integer width) throws BusinessCheckException {
         try {
             String accessToken = getAccessToken(merchantId, true,true);
             if (StringUtil.isEmpty(accessToken)) {
@@ -743,7 +743,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public String createWxCard(Integer merchantId, String wxCardId) throws BusinessCheckException {
+    public String createWxCard(Long merchantId, String wxCardId) throws BusinessCheckException {
         String cardId = "";
         try {
             MtSetting mtSetting = settingService.querySettingByName(merchantId, SettingTypeEnum.USER.getKey(),UserSettingEnum.WX_MEMBER_CARD.getKey());
@@ -879,7 +879,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public String createCardQrCode(Integer merchantId, String cardId, String code) {
+    public String createCardQrCode(Long merchantId, String cardId, String code) {
         try {
             String accessToken = getAccessToken(merchantId, false, true);
             String url = "https://api.weixin.qq.com/card/qrcode/create?access_token="+accessToken;
@@ -929,7 +929,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Boolean isOpenCard(Integer merchantId, String cardId, String openId) {
+    public Boolean isOpenCard(Long merchantId, String cardId, String openId) {
         try {
             String accessToken = getAccessToken(merchantId, false,true);
             String url = "https://api.weixin.qq.com/card/user/getcardlist?access_token="+accessToken;
@@ -965,7 +965,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public String createMiniAppLink(Integer merchantId, String path) {
+    public String createMiniAppLink(Long merchantId, String path) {
         String link = "";
         try {
             String accessToken = getAccessToken(merchantId, true,true);
@@ -1005,7 +1005,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @param platform 支付平台
      * @return
      * */
-    private Map<String, String> microPay(Integer storeId, Map<String, String> reqData, String ip, String platform) {
+    private Map<String, String> microPay(Long storeId, Map<String, String> reqData, String ip, String platform) {
         try {
             String orderSn = reqData.get("out_trade_no");
 
@@ -1091,7 +1091,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @param platform 支付平台
      * @return
      * */
-    private Map<String, String> jsapiPay(Integer storeId, Map<String, String> reqData, String ip, String platform) {
+    private Map<String, String> jsapiPay(Long storeId, Map<String, String> reqData, String ip, String platform) {
         try {
             logger.info("调用微信支付下单接口入参：{}，请求平台：{}", JsonUtil.toJSONString(reqData), platform);
             // 获取支付配置
@@ -1145,7 +1145,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @param platform 支付平台
      * @return
      * */
-    private Map<String, String> wapPay(Integer storeId, Map<String, String> reqData, String ip, String platform) {
+    private Map<String, String> wapPay(Long storeId, Map<String, String> reqData, String ip, String platform) {
         try {
             logger.info("调用微信h5支付下单接口入参{}，请求平台：{}", JsonUtil.toJSONString(reqData), platform);
             // 支付配置
@@ -1205,7 +1205,7 @@ public class WeixinServiceImpl implements WeixinService {
      * @throws BusinessCheckException
      * @return
      * */
-    private WxPayApiConfig getApiConfig(Integer storeId, String platform) throws BusinessCheckException {
+    private WxPayApiConfig getApiConfig(Long storeId, String platform) throws BusinessCheckException {
         WxPayApiConfig apiConfig;
         String mchId = wxPayBean.getMchId();
         String apiV2 = wxPayBean.getApiV2();

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java

@@ -163,7 +163,7 @@ public class BackendAccountController extends BaseController {
 
         AccountDto accountDto = null;
         if (userId > 0) {
-            TAccount tAccount = tAccountService.getAccountInfoById(userId.intValue());
+            TAccount tAccount = tAccountService.getAccountInfoById(userId);
             accountDto = new AccountDto();
             accountDto.setId(tAccount.getAcctId());
             accountDto.setAccountKey(tAccount.getAccountKey());
@@ -288,8 +288,8 @@ public class BackendAccountController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        TAccount tAccount = tAccountService.getAccountInfoById(id.intValue());
-        tAccount.setAcctId(id.intValue());
+        TAccount tAccount = tAccountService.getAccountInfoById(id);
+        tAccount.setAcctId(id);
         tAccount.setRealName(realName);
 
         if (StringUtil.isNotEmpty(accountName)) {
@@ -352,8 +352,8 @@ public class BackendAccountController extends BaseController {
         if (ids.length > 0) {
             for (int i = 0; i < ids.length; i++) {
                  if (StringUtil.isNotEmpty(ids[i])) {
-                     Integer userId = Integer.parseInt(ids[i]);
-                     TAccount tAccount = tAccountService.getAccountInfoById(userId.intValue());
+                     Long userId = Long.parseLong(ids[i]);
+                     TAccount tAccount = tAccountService.getAccountInfoById(userId);
                      if (tAccount == null) {
                          return getFailureResult(201, "账户不存在");
                      }
@@ -383,7 +383,7 @@ public class BackendAccountController extends BaseController {
     @PreAuthorize("@pms.hasPermission('system:account:edit')")
     public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        Integer userId = param.get("userId") == null ? 0 : Integer.parseInt(param.get("userId").toString());
+        Long userId = param.get("userId") == null ? 0 : Long.parseLong(param.get("userId").toString());
         Integer status = param.get("status") == null ? 0 : Integer.parseInt(param.get("status").toString());
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
@@ -391,7 +391,7 @@ public class BackendAccountController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        TAccount tAccount = tAccountService.getAccountInfoById(userId.intValue());
+        TAccount tAccount = tAccountService.getAccountInfoById(userId);
         if (tAccount == null) {
             return getFailureResult(201, "账户不存在");
         }
@@ -413,7 +413,7 @@ public class BackendAccountController extends BaseController {
     @PreAuthorize("@pms.hasPermission('system:account:edit')")
     public ResponseObject resetPwd(HttpServletRequest request, @RequestBody Map<String, Object> param) {
         String token = request.getHeader("Access-Token");
-        Integer userId = param.get("userId") == null ? 0 : Integer.parseInt(param.get("userId").toString());
+        Long userId = param.get("userId") == null ? 0 : Long.parseLong(param.get("userId").toString());
         String password = param.get("password") == null ? "" : param.get("password").toString();
 
         AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token);
@@ -421,7 +421,7 @@ public class BackendAccountController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        TAccount tAccount = tAccountService.getAccountInfoById(userId.intValue());
+        TAccount tAccount = tAccountService.getAccountInfoById(userId);
         tAccount.setPassword(password);
 
         if (tAccount != null) {

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java

@@ -182,8 +182,8 @@ public class BackendCashierController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        TAccount accountInfo = accountService.getAccountInfoById(Math.toIntExact(accountDto.getId()));
-        Integer storeId = accountInfo.getStoreId();
+        TAccount accountInfo = accountService.getAccountInfoById(accountDto.getId());
+        Long storeId = accountInfo.getStoreId();
 
         if (storeId == null || storeId < 1) {
             MtMerchant mtMerchant = merchantService.queryMerchantById(accountInfo.getMerchantId());

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommonController.java

@@ -76,13 +76,13 @@ public class BackendCommonController extends BaseController {
     public ResponseObject createQrCode(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String type = params.get("type") != null ? params.get("type").toString() : "";
-        Integer id = params.get("id") == null ? 0 : Integer.parseInt(params.get("id").toString());
+        Long id = params.get("id") == null ? 0 : Long.parseLong(params.get("id").toString());
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-        Integer merchantId = accountInfo.getMerchantId() == null ? 0 : accountInfo.getMerchantId();
+        Long merchantId = accountInfo.getMerchantId() == null ? 0 : accountInfo.getMerchantId();
         String page = QrCodeEnum.STORE.getPage() + "?" + QrCodeEnum.STORE.getKey() + "Id=" + id;
         if (type.equals(QrCodeEnum.TABLE.getKey())) {
             page = QrCodeEnum.TABLE.getPage() + "?" + QrCodeEnum.TABLE.getKey() + "Id=" + id;

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java

@@ -174,7 +174,7 @@ public class BackendStoreController extends BaseController {
 	public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
 		String token = request.getHeader("Access-Token");
 		String status = params.get("status") != null ? params.get("status").toString() : StatusEnum.ENABLED.getKey();
-		Integer storeId = params.get("storeId") == null ? 0 : Integer.parseInt(params.get("storeId").toString());
+		Long storeId = params.get("storeId") == null ? 0 : Long.parseLong(params.get("storeId").toString());
 
 		AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 		if (accountInfo == null) {
@@ -284,7 +284,7 @@ public class BackendStoreController extends BaseController {
 
 		// 修改店铺
 		if (StringUtil.isNotEmpty(storeId)) {
-			storeInfo.setId(Integer.parseInt(storeId));
+			storeInfo.setId(Long.parseLong(storeId));
 		}
 
 		String operator = accountInfo.getAccountName();
@@ -304,7 +304,7 @@ public class BackendStoreController extends BaseController {
 	@RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
 	@CrossOrigin
 	@PreAuthorize("@pms.hasPermission('store:list')")
-	public ResponseObject getStoreInfo(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
+	public ResponseObject getStoreInfo(HttpServletRequest request, @PathVariable("id") Long id) throws BusinessCheckException {
 		String token = request.getHeader("Access-Token");
 		AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
 		if (accountInfo == null) {

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/request/AccountInfoRequest.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 public class AccountInfoRequest implements Serializable {
 
     @ApiModelProperty(value="账号ID", name="id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value="用户名", name="accountName")
     private String accountName;

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/request/CommissionCashRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class CommissionCashRequest implements Serializable {
 
     @ApiModelProperty(value="ID", name="id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value="分佣金额", name="amount")
     private String amount;

fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/request/CommissionLogRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class CommissionLogRequest implements Serializable {
 
     @ApiModelProperty(value="ID", name="id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value="结算uuid", name="settleUuid")
     private String settleUuid;

fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/request/MyCouponRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class MyCouponRequest implements Serializable {
 
     @ApiModelProperty(value="卡券ID", name="id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value="会员卡券ID", name="userCouponId")
     private Integer userCouponId;

fuintBackend/fuint-application/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 # 基本配置
 server.port=8080
-env.profile=dev
-env.properties.path=D:/fuint/store-windows/fuintBackend/configure
+env.profile=test
+env.properties.path=E:/MagicalJourney/Projects/store/store-windows-main/store-windows/fuintBackend/configure
 
 # 数据库配置
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/bean/GoodsTopBean.java

@@ -25,7 +25,7 @@ public class GoodsTopBean implements Serializable {
      * 商品ID
      */
     @ApiModelProperty("商品ID")
-    private Integer id;
+    private Long id;
 
     /**
      * 商品名称

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/bean/MemberTopBean.java

@@ -24,7 +24,7 @@ public class MemberTopBean implements Serializable {
      * 会员ID
      */
     @ApiModelProperty("卡券ID")
-    private Integer id;
+    private Long id;
 
     /**
      * 会员名称

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/bean/StoreDistanceBean.java

@@ -20,7 +20,7 @@ public class StoreDistanceBean implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("店铺ID")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty("数量")
     private String distance;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtAddressMapper.java

@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Param;
  * CopyRight https://www.fuint.cn
  */
 public interface MtAddressMapper extends BaseMapper<MtAddress> {
-    int setDefault(@Param("userId") Integer userId, @Param("addressId") Integer addressId);
+    int setDefault(@Param("userId") Long userId, @Param("addressId") Long addressId);
 }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtOrderAddressMapper.java

@@ -14,6 +14,6 @@ import java.util.List;
  */
 public interface MtOrderAddressMapper extends BaseMapper<MtOrderAddress> {
 
-    List<MtOrderAddress> getOrderAddress(@Param("orderId") Integer orderId);
+    List<MtOrderAddress> getOrderAddress(@Param("orderId") Long orderId);
 
 }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TDutyMapper.java

@@ -13,11 +13,11 @@ import java.util.List;
  */
 public interface TDutyMapper extends BaseMapper<TDuty> {
 
-    List<TDuty> findByStatus(@Param("merchantId") Integer merchantId, @Param("status") String status);
+    List<TDuty> findByStatus(@Param("merchantId") Long merchantId, @Param("status") String status);
 
-    List<TDuty> findByIdIn(@Param("ids") List<Integer> ids);
+    List<TDuty> findByIdIn(@Param("ids") List<Long> ids);
 
-    TDuty findByName(@Param("merchantId") Integer merchantId, @Param("name") String name);
+    TDuty findByName(@Param("merchantId") Long merchantId, @Param("name") String name);
 
-    List<Long> getRoleIdsByAccountId(@Param("accountId") Integer accountId);
+    List<Long> getRoleIdsByAccountId(@Param("accountId") Long accountId);
 }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TDutySourceMapper.java

@@ -14,8 +14,8 @@ import java.util.List;
  */
 public interface TDutySourceMapper extends BaseMapper<TDutySource> {
 
-    void deleteSourcesByDutyId(@Param("dutyId") Integer dutyId);
+    void deleteSourcesByDutyId(@Param("dutyId") Long dutyId);
 
-    List<Long> findSourceIdsByDutyId(@Param("dutyId") Integer dutyId);
+    List<Long> findSourceIdsByDutyId(@Param("dutyId") Long dutyId);
 
 }

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtAddress.java

@@ -25,11 +25,11 @@ public class MtAddress implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("用户ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("收货人姓名")
     private String name;
@@ -38,13 +38,13 @@ public class MtAddress implements Serializable {
     private String mobile;
 
     @ApiModelProperty("省份ID")
-    private Integer provinceId;
+    private Long provinceId;
 
     @ApiModelProperty("城市ID")
-    private Integer cityId;
+    private Long cityId;
 
     @ApiModelProperty("区/县ID")
-    private Integer regionId;
+    private Long regionId;
 
     @ApiModelProperty("详细地址")
     private String detail;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtArticle.java

@@ -25,8 +25,8 @@ public class MtArticle implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("标题")
     private String title;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBalance.java

@@ -26,8 +26,8 @@ public class MtBalance implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBanner.java

@@ -25,8 +25,8 @@ public class MtBanner implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("标题")
     private String title;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBook.java

@@ -25,8 +25,8 @@ public class MtBook implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("预约名称")
     private String name;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBookCate.java

@@ -25,8 +25,8 @@ public class MtBookCate implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("分类名称")
     private String name;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtBookItem.java

@@ -25,8 +25,8 @@ public class MtBookItem implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCart.java

@@ -25,8 +25,8 @@ public class MtCart implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionCash.java

@@ -26,8 +26,8 @@ public class MtCommissionCash implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("结算单号")
     private String settleNo;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionLog.java

@@ -26,8 +26,8 @@ public class MtCommissionLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("分佣对象,member:会员分销；staff：员工提成")
     private String target;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRelation.java

@@ -25,8 +25,8 @@ public class MtCommissionRelation implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRule.java

@@ -25,8 +25,8 @@ public class MtCommissionRule implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("规则名称")
     private String name;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRuleItem.java

@@ -26,8 +26,8 @@ public class MtCommissionRuleItem implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("方案类型,goods:商品销售；coupon：卡券销售；recharge：会员充值")
     private String type;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtConfirmLog.java

@@ -26,8 +26,8 @@ public class MtConfirmLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("编码")
     private String code;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCoupon.java

@@ -26,17 +26,17 @@ public class MtCoupon implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("券组ID")
-    private Integer groupId;
+    private Long groupId;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("券类型，C优惠券；P储值卡；T计次卡")
     private String type;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCouponGoods.java

@@ -25,8 +25,8 @@ public class MtCouponGoods implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("卡券ID")
     private Integer couponId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtCouponGroup.java

@@ -28,8 +28,8 @@ public class MtCouponGroup implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增ID")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("所属商户ID")
     private Integer merchantId;

fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtGive.java

@@ -26,8 +26,8 @@ public class MtGive implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("自增")
-    @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "ID", type = IdType.ID_WORKER)
+    private Long id;
 
     @ApiModelProperty("获赠者用户ID")
     private Integer userId;