fix 将id修改为long型（完成）

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

@@ -52,17 +52,17 @@ public class AccountDto {
     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;
 }

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

@@ -10,12 +10,12 @@ import java.util.Date;
 public class ArticleDto implements Serializable {
 
     /**
-    * 自增ID 
+    * 自增ID
     */
     private Long id;
 
    /**
-    * 标题 
+    * 标题
     */
     private String title;
 
@@ -27,12 +27,12 @@ public class ArticleDto implements Serializable {
     /**
      * 所属商户
      * */
-    private Integer merchantId;
+    private Long merchantId;
 
     /**
      * 所属店铺
      * */
-    private Integer storeId;
+    private Long storeId;
 
     /**
      * 链接地址
@@ -45,32 +45,32 @@ public class ArticleDto implements Serializable {
     private Long click;
 
    /**
-    * 图片地址 
+    * 图片地址
     */
     private String image;
 
    /**
-    * 描述 
+    * 描述
     */
     private String description;
 
    /**
-    * 创建时间 
+    * 创建时间
     */
     private Date createTime;
 
    /**
-    * 更新时间 
+    * 更新时间
     */
     private Date updateTime;
 
    /**
-    * 最后操作人 
+    * 最后操作人
     */
     private String operator;
 
    /**
-    * A：正常；D：删除 
+    * A：正常；D：删除
     */
     private String status;
 
@@ -97,16 +97,16 @@ public class ArticleDto implements Serializable {
     public void setBrief(String brief){
         this.brief=brief;
     }
-    public Integer getMerchantId(){
+    public Long getMerchantId(){
         return merchantId;
     }
-    public void setMerchantId(Integer merchantId){
+    public void setMerchantId(Long merchantId){
         this.merchantId=merchantId;
     }
-    public Integer getStoreId(){
+    public Long getStoreId(){
         return storeId;
     }
-    public void setStoreId(Integer storeId){
+    public void setStoreId(Long storeId){
         this.storeId=storeId;
     }
     public String getUrl(){

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

@@ -24,7 +24,7 @@ public class BalanceDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("会员信息")
     private MtUser userInfo;

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

@@ -28,10 +28,10 @@ public class BannerDto implements Serializable {
     String position;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("所属店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("链接地址")
     private String url;

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

@@ -27,10 +27,10 @@ public class BookDto implements Serializable {
     private String name;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("所属店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("预约类型")
     private String type;
@@ -39,10 +39,10 @@ public class BookDto implements Serializable {
     private String logo;
 
     @ApiModelProperty("关联商品ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("类别ID")
-    private Integer cateId;
+    private Long cateId;
 
     @ApiModelProperty("可预约日期")
     private String serviceDates;

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

@@ -22,28 +22,28 @@ public class BookItemDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("所属店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("所属店铺信息")
     private MtStore storeInfo;
 
     @ApiModelProperty("预约分类ID")
-    private Integer cateId;
+    private Long cateId;
 
     @ApiModelProperty("预约项目ID")
-    private Integer bookId;
+    private Long bookId;
 
     @ApiModelProperty("预约项目名称")
     private String bookName;
 
     @ApiModelProperty("预约用户ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("商品ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("核销码")
     private String verifyCode;

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

@@ -26,22 +26,22 @@ public class CommissionCashDto implements Serializable {
     private String uuid;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("所属店铺信息")
     private MtStore storeInfo;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("用户信息")
     private OrderUserDto userInfo;
 
     @ApiModelProperty("员工ID")
-    private Integer staffId;
+    private Long staffId;
 
     @ApiModelProperty("所属店铺信息")
     private MtStaff staffInfo;

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

@@ -34,28 +34,28 @@ public class CommissionLogDto implements Serializable {
     private Integer level;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("用户信息")
     private OrderUserDto userInfo;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("所属店铺信息")
     private MtStore storeInfo;
 
     @ApiModelProperty("员工ID")
-    private Integer staffId;
+    private Long staffId;
 
     @ApiModelProperty("所属店铺信息")
     private MtStaff staffInfo;
 
     @ApiModelProperty("订单ID")
-    private Integer orderId;
+    private Long orderId;
 
     @ApiModelProperty("订单信息")
     private MtOrder orderInfo;
@@ -64,7 +64,7 @@ public class CommissionLogDto implements Serializable {
     private BigDecimal amount;
 
     @ApiModelProperty("规则ID")
-    private Integer ruleId;
+    private Long ruleId;
 
     @ApiModelProperty("分佣规则信息")
     private MtCommissionRule ruleInfo;

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

@@ -19,10 +19,10 @@ public class CommissionRelationDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("会员信息")
     private MtUser userInfo;
@@ -31,7 +31,7 @@ public class CommissionRelationDto implements Serializable {
     private String inviteCode;
 
     @ApiModelProperty("被邀请会员ID")
-    private Integer subUserId;
+    private Long subUserId;
 
     @ApiModelProperty("会员信息")
     private MtUser subUserInfo;

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

@@ -27,10 +27,10 @@ public class CommissionRuleDto implements Serializable {
     private String target;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("适用店铺ID列表")
     private List<Integer> storeIdList;

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

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 public class CommissionRuleItemDto implements Serializable {
 
     @ApiModelProperty("商品ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("商品名称")
     private String goodsName;

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

@@ -22,13 +22,13 @@ public class GiveDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("获赠者会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("赠送者会员ID")
-    private Integer giveUserId;
+    private Long giveUserId;
 
     @ApiModelProperty("获赠者手机号")
     private String mobile;

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

@@ -29,13 +29,13 @@ public class GiveItemDto implements Serializable {
     private String userMobile;
 
     @ApiModelProperty("分组ID")
-    private Integer groupId;
+    private Long groupId;
 
     @ApiModelProperty("分组名称")
     private String groupName;
 
     @ApiModelProperty("卡券ID")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty("卡券名称")
     private String couponName;

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

@@ -22,13 +22,13 @@ public class GoodsCateDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("所属商户名称")
     private String merchantName;
 
     @ApiModelProperty("所属店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("所属店铺名称")
     private String storeName;

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

@@ -21,13 +21,13 @@ import java.util.List;
 public class GoodsDetailDto implements Serializable {
 
     @ApiModelProperty("自增ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("商品名称")
     private String name;
 
     @ApiModelProperty("分类ID")
-    private Integer cateId;
+    private Long cateId;
 
     @ApiModelProperty("商品条码")
     private String goodsNo;

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

@@ -29,7 +29,7 @@ public class GoodsSkuDto implements Serializable {
     private String logo;
 
     @ApiModelProperty("商品ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("规格ID")
     private String specIds;

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

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

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

@@ -25,13 +25,13 @@ public class MemberGroupDto implements Serializable {
     private String name;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("默认店铺")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("父ID")
-    private Integer parentId;
+    private Long parentId;
 
     @ApiModelProperty("创建时间")
     private Date createTime;

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

@@ -36,7 +36,7 @@ public class MyCouponDto 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/PointDto.java

@@ -22,7 +22,7 @@ public class PointDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("会员信息")
     private MtUser userInfo;

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

@@ -22,13 +22,13 @@ public class RefundDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("订单ID")
-    private Integer orderId;
+    private Long orderId;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("退款金额")
     private BigDecimal amount;
@@ -37,7 +37,7 @@ public class RefundDto implements Serializable {
     private String type;
 
     @ApiModelProperty("会员ID")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty("用户备注")
     private String remark;

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

@@ -21,13 +21,13 @@ public class ReqCouponDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("分组ID")
-    private Integer groupId;
+    private Long groupId;
 
     @ApiModelProperty("类型")
     private String type;

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

@@ -20,10 +20,10 @@ public class ReqCouponGroupDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("分组名称")
     private String name;

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

@@ -42,10 +42,10 @@ public class ReqSendLogDto implements Serializable {
     private String mobile;
 
     @ApiModelProperty("分组ID")
-    private Integer groupId;
+    private Long groupId;
 
     @ApiModelProperty("卡券ID")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty("分组名称")
     private String groupName;

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

@@ -19,7 +19,7 @@ import java.util.List;
 public class ResCateDto implements Serializable {
 
     @ApiModelProperty("分类ID")
-    private Integer cateId;
+    private Long cateId;
 
     @ApiModelProperty("分类名称")
     private String name;

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

@@ -18,7 +18,7 @@ public class RoleDto {
     private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("名称")
     private String name;

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

@@ -25,10 +25,10 @@ public class SettlementDto implements Serializable {
     private String settlementNo;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("订单总金额")
     private BigDecimal totalOrderAmount;

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

@@ -20,10 +20,10 @@ public class SettlementOrderDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("结算ID")
-    private Integer settlementId;
+    private Long settlementIdupId;
 
     @ApiModelProperty("订单ID")
-    private Integer orderId;
+    private Long orderId;
 
     @ApiModelProperty("订单信息")
     private UserOrderDto orderInfo;

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

@@ -21,7 +21,7 @@ public class SmsTemplateDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("模板名称")
     private String name;
@@ -44,4 +44,4 @@ public class SmsTemplateDto implements Serializable {
     @ApiModelProperty("状态，1：正常；2：删除")
     private String status;
 
-}
+}

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

@@ -20,7 +20,7 @@ public class SourceDto implements Serializable {
     private long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("菜单名称")
     private String name;

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

@@ -20,7 +20,7 @@ public class StoreDto implements Serializable {
     private Long id;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("商户号")
     private String merchantNo;
@@ -106,4 +106,4 @@ public class StoreDto implements Serializable {
     @ApiModelProperty("最后操作人")
     private String operator;
 
-}
+}

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

@@ -17,7 +17,7 @@ import java.io.Serializable;
 public class TableOverviewDto implements Serializable {
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("桌码")
     private String code;

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

@@ -35,7 +35,7 @@ public class UserDto implements Serializable {
     private String hasPassword;
 
     @ApiModelProperty("分组ID")
-    private Integer groupId;
+    private Long groupId;
 
     @ApiModelProperty("分组信息")
     private UserGroupDto groupInfo;

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

@@ -24,13 +24,13 @@ public class UserGroupDto implements Serializable {
     private String name;
 
     @ApiModelProperty("所属商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("默认店铺")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("父ID")
-    private Integer parentId;
+    private Long parentId;
 
     @ApiModelProperty("子分组")
     private List<UserGroupDto> children;

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

@@ -74,7 +74,7 @@ public class UserOrderDto implements Serializable {
     private BigDecimal deliveryFee;
 
     @ApiModelProperty("使用积分")
-    private Long usePoint;
+    private Integer usePoint;
 
     @ApiModelProperty("积分金额")
     private BigDecimal pointAmount;

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

@@ -13,6 +13,6 @@ import java.io.Serializable;
 public class BookDetailParam implements Serializable {
 
     @ApiModelProperty(value="预约ID", name="bookId")
-    private Integer bookId;
+    private Long bookId;
 
 }

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

@@ -16,7 +16,7 @@ public class BookListParam extends PageParam implements Serializable {
     private String name;
 
     @ApiModelProperty(value="分类ID", name="cateId")
-    private Integer cateId;
+    private Long cateId;
 
     @ApiModelProperty(value="商户号", name="merchantNo")
     private String merchantNo;

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class BookableParam implements Serializable {
 
     @ApiModelProperty(value="预约ID", name="bookId")
-    private Integer bookId;
+    private Long bookId;
 
     @ApiModelProperty(value="预约日期", name="date")
     private String date;

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

@@ -20,6 +20,6 @@ public class CartClearParam extends PageParam implements Serializable {
     private String hangNo;
 
     @ApiModelProperty(value="下单会员ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
 }

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

@@ -19,10 +19,10 @@ public class CartListParam extends PageParam implements Serializable {
     private String cartIds;
 
     @ApiModelProperty(value="商品ID", name="goodsId")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty(value="卡券ID", name="couponId")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty(value="商品SkuID", name="skuId")
     private Integer skuId;
@@ -37,7 +37,7 @@ public class CartListParam extends PageParam implements Serializable {
     private String hangNo;
 
     @ApiModelProperty(value="下单会员ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value="订单模式", name="orderMode")
     private String orderMode;

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

@@ -16,7 +16,7 @@ public class CartSaveParam implements Serializable {
     private Integer cartId;
 
     @ApiModelProperty(value="商品ID", name="goodsId")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty(value="商品SkuID", name="skuId")
     private Integer skuId;
@@ -34,6 +34,6 @@ public class CartSaveParam implements Serializable {
     private String hangNo;
 
     @ApiModelProperty(value="下单会员ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
 }

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

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
 public class CommissionRuleItemParam implements Serializable {
 
     @ApiModelProperty("商品ID")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty("商品名称")
     private String goodsName;

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

@@ -26,10 +26,10 @@ public class CommissionRuleParam implements Serializable {
     private String target;
 
     @ApiModelProperty("商户ID")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty("店铺ID")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty("适用店铺ID列表")
     private List<Integer> storeIdList;

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
 public class CouponInfoParam implements Serializable {
 
     @ApiModelProperty(value="卡券ID", name="couponId")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty(value="会员卡券编码", name="userCouponCode")
     private String userCouponCode;

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

@@ -16,7 +16,7 @@ public class CouponListParam extends PageParam implements Serializable {
     private String type;
 
     @ApiModelProperty(value="商户ID", name="merchantId")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty(value="领取所需积分", name="needPoint")
     private Integer needPoint;
@@ -28,7 +28,7 @@ public class CouponListParam extends PageParam implements Serializable {
     private String sortType;
 
     @ApiModelProperty(value="下单会员ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value="状态", name="status")
     private String status;

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

@@ -13,13 +13,13 @@ import java.io.Serializable;
 public class CouponReceiveParam implements Serializable {
 
     @ApiModelProperty(value="卡券ID", name="couponId")
-    private Integer couponId;
+    private Long couponId;
 
     @ApiModelProperty(value="领取数量", name="num")
     private Integer num;
 
     @ApiModelProperty(value="会员ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value="领取码", name="receiveCode")
     private String receiveCode;

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

@@ -25,12 +25,12 @@ public class GiveParam implements Serializable {
     private String message;
 
     @ApiModelProperty(value="转赠人ID", name="userId")
-    private Integer userId;
+    private Long userId;
 
     @ApiModelProperty(value="商户ID", name="merchantId")
-    private Integer merchantId;
+    private Long merchantId;
 
     @ApiModelProperty(value="店铺ID", name="storeId")
-    private Integer storeId;
+    private Long storeId;
 
 }

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

@@ -55,7 +55,7 @@ public class SettlementParam implements Serializable {
     private String cashierDiscountAmount;
 
     @ApiModelProperty(value="商品ID", name="goodsId")
-    private Integer goodsId;
+    private Long goodsId;
 
     @ApiModelProperty(value="商品skuID", name="skuId")
     private Integer skuId;

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class TableParam implements Serializable {
 
     @ApiModelProperty(value="店铺ID", name="storeId")
-    private Integer storeId;
+    private Long storeId;
 
     @ApiModelProperty(value="会员手机号", name="mobile")
     private String mobile;

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

@@ -30,7 +30,7 @@ public interface AddressService extends IService<MtAddress> {
      * @throws BusinessCheckException
      * @return
      */
-    MtAddress detail(Integer id) throws BusinessCheckException;
+    MtAddress detail(Long id) throws BusinessCheckException;
 
     /**
      * 根据条件查询地址列表

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

@@ -57,6 +57,6 @@ public interface AlipayService {
      * @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;
 
-}
+}

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

@@ -39,7 +39,7 @@ public interface ArticleService extends IService<MtArticle> {
      * @param  id 文章ID
      * @throws BusinessCheckException
      */
-    MtArticle queryArticleById(Integer id) throws BusinessCheckException;
+    MtArticle queryArticleById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID获取文章详情
@@ -47,7 +47,7 @@ public interface ArticleService extends IService<MtArticle> {
      * @param  id 文章ID
      * @throws BusinessCheckException
      */
-    ArticleDto getArticleDetail(Integer id) throws BusinessCheckException;
+    ArticleDto getArticleDetail(Long id) throws BusinessCheckException;
 
     /**
      * 更新文章

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

@@ -41,7 +41,7 @@ public interface BannerService extends IService<MtBanner> {
      * @throws BusinessCheckException
      * @return
      */
-    MtBanner queryBannerById(Integer id) throws BusinessCheckException;
+    MtBanner queryBannerById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID删除焦点图
@@ -51,7 +51,7 @@ public interface BannerService extends IService<MtBanner> {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteBanner(Integer id, String operator) throws BusinessCheckException;
+    void deleteBanner(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 更新焦点图

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

@@ -40,7 +40,7 @@ public interface BookCateService extends IService<MtBookCate> {
      * @throws BusinessCheckException
      * @return
      */
-    MtBookCate getBookCateById(Integer id) throws BusinessCheckException;
+    MtBookCate getBookCateById(Long id) throws BusinessCheckException;
 
     /**
      * 更新预约类别

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

@@ -41,7 +41,7 @@ public interface BookItemService extends IService<MtBookItem> {
      * @throws BusinessCheckException
      * @return
      */
-    MtBookItem getBookItemById(Integer id) throws BusinessCheckException;
+    MtBookItem getBookItemById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID获取预约订单详情
@@ -50,7 +50,7 @@ public interface BookItemService extends IService<MtBookItem> {
      * @throws BusinessCheckException
      * @return
      */
-    BookItemDto getBookDetail(Integer id) throws BusinessCheckException;
+    BookItemDto getBookDetail(Long id) throws BusinessCheckException;
 
     /**
      * 更新预约订单
@@ -78,5 +78,5 @@ public interface BookItemService extends IService<MtBookItem> {
      * @throws BusinessCheckException
      * @return
      * */
-    Boolean cancelBook(Integer id, String remark) throws BusinessCheckException;
+    Boolean cancelBook(Long id, String remark) throws BusinessCheckException;
 }

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

@@ -43,7 +43,7 @@ public interface BookService extends IService<MtBook> {
      * @throws BusinessCheckException
      * @return
      */
-    BookDto getBookById(Integer id) throws BusinessCheckException, ParseException;
+    BookDto getBookById(Long id) throws BusinessCheckException, ParseException;
 
     /**
      * 更新预约项目

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

@@ -40,7 +40,7 @@ public interface CateService extends IService<MtGoodsCate> {
      * @param  id ID
      * @throws BusinessCheckException
      */
-    MtGoodsCate queryCateById(Integer id) throws BusinessCheckException;
+    MtGoodsCate queryCateById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID删除
@@ -50,7 +50,7 @@ public interface CateService extends IService<MtGoodsCate> {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteCate(Integer id, String operator) throws BusinessCheckException;
+    void deleteCate(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 更新分类

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

@@ -42,7 +42,7 @@ public interface CommissionCashService extends IService<MtCommissionCash> {
      * @throws BusinessCheckException
      * @return
      */
-    CommissionCashDto queryCommissionCashById(Integer id) throws BusinessCheckException;
+    CommissionCashDto queryCommissionCashById(Long id) throws BusinessCheckException;
 
     /**
      * 更新分销提成记录

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

@@ -31,7 +31,7 @@ public interface CommissionLogService extends IService<MtCommissionLog> {
      * @throws BusinessCheckException
      * @return
      */
-    void calculateCommission(Integer orderId) throws BusinessCheckException;
+    void calculateCommission(Long orderId) throws BusinessCheckException;
 
     /**
      * 根据ID获取记录信息
@@ -40,7 +40,7 @@ public interface CommissionLogService extends IService<MtCommissionLog> {
      * @throws BusinessCheckException
      * @return
      */
-    CommissionLogDto queryCommissionLogById(Integer id) throws BusinessCheckException;
+    CommissionLogDto queryCommissionLogById(Long id) throws BusinessCheckException;
 
     /**
      * 更新分销提成记录

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

@@ -41,7 +41,7 @@ public interface CommissionRuleService extends IService<MtCommissionRule> {
      * @param  id
      * @throws BusinessCheckException
      */
-    CommissionRuleDto queryCommissionRuleById(Integer id) throws BusinessCheckException;
+    CommissionRuleDto queryCommissionRuleById(Long id) throws BusinessCheckException;
 
     /**
      * 更新数据

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

@@ -31,14 +31,14 @@ public interface ConfirmLogService extends IService<MtConfirmLog> {
      * @param userCouponId
      * @return
      * */
-    Long getConfirmNum(Integer userCouponId) throws BusinessCheckException;
+    Long getConfirmNum(Long userCouponId) throws BusinessCheckException;
 
     /**
      * 获取卡券核销列表
      * @param userCouponId
      * @return
      * */
-    List<MtConfirmLog> getConfirmList(Integer userCouponId) throws BusinessCheckException;
+    List<MtConfirmLog> getConfirmList(Long userCouponId) throws BusinessCheckException;
 
     /**
      * 获取核销总数

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

@@ -50,7 +50,7 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      * @param id 分组ID
      * @throws BusinessCheckException
      */
-    MtCouponGroup queryCouponGroupById(Integer id) throws BusinessCheckException;
+    MtCouponGroup queryCouponGroupById(Long id) throws BusinessCheckException;
 
     /**
      * 根据分组ID 删除分组信息
@@ -59,7 +59,7 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      * @param operator 操作人
      * @throws BusinessCheckException
      */
-    void deleteCouponGroup(Integer id, String operator) throws BusinessCheckException;
+    void deleteCouponGroup(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 根据分组ID 获取券种类数量
@@ -67,7 +67,7 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      * @param id       分组ID
      * @throws BusinessCheckException
      */
-    Integer getCouponNum(Integer id) throws BusinessCheckException;
+    Integer getCouponNum(Long id) throws BusinessCheckException;
 
     /**
      * 根据分组ID 获取券总价值
@@ -75,7 +75,7 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      * @param id 分组ID
      * @throws BusinessCheckException
      */
-    BigDecimal getCouponMoney(Integer id) throws BusinessCheckException;
+    BigDecimal getCouponMoney(Long id) throws BusinessCheckException;
 
     /**
      * 获取已发放套数
@@ -83,7 +83,7 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      * @param  id  分组ID
      * @throws BusinessCheckException
      * */
-    Integer getSendNum(Integer id) throws BusinessCheckException;
+    Integer getSendNum(Long id) throws BusinessCheckException;
 
     /**
      * 导入发券列表
@@ -106,5 +106,5 @@ public interface CouponGroupService extends IService<MtCouponGroup> {
      *
      * @param groupId 分组ID
      * */
-    GroupDataDto getGroupData(Integer groupId, HttpServletRequest request, Model model) throws BusinessCheckException;
+    GroupDataDto getGroupData(Long groupId, HttpServletRequest request, Model model) throws BusinessCheckException;
 }

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

@@ -89,7 +89,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      */
-    Boolean batchSendCoupon(Integer couponId, List<Integer> userIds, Integer num, String uuid, String operator) throws BusinessCheckException;
+    Boolean batchSendCoupon(Long couponId, List<Long> userIds, Integer num, String uuid, String operator) throws BusinessCheckException;
 
     /**
      * 根据分组获取卡券列表
@@ -97,7 +97,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      * */
-    List<MtCoupon> queryCouponListByGroupId(Integer groupId) throws BusinessCheckException;
+    List<MtCoupon> queryCouponListByGroupId(Long groupId) throws BusinessCheckException;
 
     /**
      * 核销卡券
@@ -120,7 +120,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteUserCoupon(Integer id, String operator) throws BusinessCheckException;
+    void deleteUserCoupon(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 根据券ID 撤销个人卡券消费流水
@@ -131,7 +131,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      */
-    void rollbackUserCoupon(Integer id, Integer userCouponId,String operator) throws BusinessCheckException;
+    void rollbackUserCoupon(Long id, Integer userCouponId,String operator) throws BusinessCheckException;
 
     /**
      * 根据ID获取用户卡券信息
@@ -139,7 +139,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @throws BusinessCheckException
      * @return
      * */
-    MtUserCoupon queryUserCouponById(Integer userCouponId) throws BusinessCheckException;
+    MtUserCoupon queryUserCouponById(Long userCouponId) throws BusinessCheckException;
 
     /**
      * 根据批次撤销卡券
@@ -174,6 +174,6 @@ public interface CouponService extends IService<MtCoupon> {
      * @param userId
      * @return
      * */
-    boolean removeCoupon(Integer userCouponId, Integer userId) throws BusinessCheckException;
+    boolean removeCoupon(Integer userCouponId, Long userId) throws BusinessCheckException;
 
 }

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

@@ -17,7 +17,7 @@ import java.util.List;
  * CopyRight https://www.fuint.cn
  */
 public interface DutyService extends IService<TDuty> {
-    
+
     /**
      * 角色保存方法
      *
@@ -101,7 +101,7 @@ public interface DutyService extends IService<TDuty> {
      * @param dutyId 角色ID
      * @return
      */
-    List<Long> getSourceIdsByDutyId(Integer dutyId);
+    List<Long> getSourceIdsByDutyId(Long dutyId);
 
     /**
      * 获取角色的树形结构

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

@@ -37,7 +37,7 @@ public interface GenCodeService {
      * @throws BusinessCheckException
      * @return
      */
-    TGenCode queryGenCodeById(Integer id) throws BusinessCheckException;
+    TGenCode queryGenCodeById(Long id) throws BusinessCheckException;
 
     /**
      * 更新生成代码
@@ -49,7 +49,7 @@ public interface GenCodeService {
 
     /**
      * 生成代码（自定义路径）
-     * 
+     *
      * @param tableName 表名称
      * @return
      */

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

@@ -56,7 +56,7 @@ public interface GoodsService {
      * @throws BusinessCheckException
      * @return
      */
-    MtGoods queryGoodsByGoodsNo(Integer merchantId, String goodsNo) throws BusinessCheckException;
+    MtGoods queryGoodsByGoodsNo(Long merchantId, String goodsNo) throws BusinessCheckException;
 
     /**
      * 根据条码获取sku信息
@@ -74,7 +74,7 @@ public interface GoodsService {
      * @throws BusinessCheckException
      * @return
      */
-    GoodsDto getGoodsDetail(Integer id, boolean getDeleteSpec) throws InvocationTargetException, IllegalAccessException;
+    GoodsDto getGoodsDetail(Long id, boolean getDeleteSpec) throws InvocationTargetException, IllegalAccessException;
 
     /**
      * 根据ID删除

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

@@ -46,7 +46,7 @@ public interface MemberGroupService extends IService<MtUserGroup> {
      * @param  id 分组ID
      * @throws BusinessCheckException
      */
-    MtUserGroup queryMemberGroupById(Integer id) throws BusinessCheckException;
+    MtUserGroup queryMemberGroupById(Long id) throws BusinessCheckException;
 
     /**
      * 根据分组ID删除分组信息
@@ -55,5 +55,5 @@ public interface MemberGroupService extends IService<MtUserGroup> {
      * @param  operator 操作人
      * @throws BusinessCheckException
      */
-    void deleteMemberGroup(Integer id, String operator) throws BusinessCheckException;
+    void deleteMemberGroup(Long id, String operator) throws BusinessCheckException;
 }

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

@@ -113,7 +113,7 @@ public interface MemberService extends IService<MtUser> {
      * @throws BusinessCheckException
      * @return
      */
-    MtUserGrade queryMemberGradeByGradeId(Integer id) throws BusinessCheckException;
+    MtUserGrade queryMemberGradeByGradeId(Long id) throws BusinessCheckException;
 
     /**
      * 根据会员手机获取会员信息
@@ -254,5 +254,5 @@ public interface MemberService extends IService<MtUser> {
      * @param storeId 店铺ID
      * @return
      * */
-    List<Integer> getUserIdList(Long merchantId, Long storeId);
+    List<Long> getUserIdList(Long merchantId, Long storeId);
 }

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

@@ -37,7 +37,7 @@ public interface MessageService {
      * @throws BusinessCheckException
      * @return
      */
-    void sendMessage(Integer msgId, boolean isRead) throws BusinessCheckException;
+    void sendMessage(Long msgId, boolean isRead) throws BusinessCheckException;
 
     /**
      * 获取最新一条未读消息
@@ -46,7 +46,7 @@ public interface MessageService {
      * @throws BusinessCheckException
      * @return
      */
-    MtMessage getOne(Integer userId) throws BusinessCheckException;
+    MtMessage getOne(Long userId) throws BusinessCheckException;
 
     /**
      * 获取需要发送的消息

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

@@ -39,7 +39,7 @@ public interface OpenGiftService {
      * @throws BusinessCheckException
      * @return
      */
-    OpenGiftDto getOpenGiftDetail(Integer id) throws BusinessCheckException;
+    OpenGiftDto getOpenGiftDetail(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID删除开卡赠礼
@@ -49,7 +49,7 @@ public interface OpenGiftService {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteOpenGift(Integer id, String operator) throws BusinessCheckException;
+    void deleteOpenGift(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 更新开卡赠礼

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

@@ -67,7 +67,7 @@ public interface OrderService extends IService<MtOrder> {
      * @throws BusinessCheckException
      * @return
      */
-    UserOrderDto getOrderById(Integer id) throws BusinessCheckException;
+    UserOrderDto getOrderById(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID获取订单
@@ -76,7 +76,7 @@ public interface OrderService extends IService<MtOrder> {
      * @throws BusinessCheckException
      * @return
      */
-    UserOrderDto getMyOrderById(Integer id) throws BusinessCheckException;
+    UserOrderDto getMyOrderById(Long id) throws BusinessCheckException;
 
     /**
      * 取消订单
@@ -96,7 +96,7 @@ public interface OrderService extends IService<MtOrder> {
      * @throws BusinessCheckException
      * @return
      */
-    void deleteOrder(Integer orderId, String operator) throws BusinessCheckException;
+    void deleteOrder(Long orderId, String operator) throws BusinessCheckException;
 
     /**
      * 根据订单号获取订单详情

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

@@ -42,5 +42,5 @@ public interface PointService extends IService<MtPoint> {
      * @throws BusinessCheckException
      * @return
      */
-    boolean doGift(Integer userId, String mobile, Integer amount, String remark) throws BusinessCheckException;
+    boolean doGift(Long userId, String mobile, Integer amount, String remark) throws BusinessCheckException;
 }

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

@@ -48,7 +48,7 @@ public interface RefundService extends IService<MtRefund> {
      * @param id ID
      * @throws BusinessCheckException
      */
-    RefundDto getRefundById(Integer id) throws BusinessCheckException;
+    RefundDto getRefundById(Long id) throws BusinessCheckException;
 
     /**
      * 根据订单ID获取售后订单信息
@@ -56,7 +56,7 @@ public interface RefundService extends IService<MtRefund> {
      * @param  orderId
      * @throws BusinessCheckException
      */
-    MtRefund getRefundByOrderId(Integer orderId) throws BusinessCheckException;
+    MtRefund getRefundByOrderId(Long orderId) throws BusinessCheckException;
 
     /**
      * 更新售后订单
@@ -81,7 +81,7 @@ public interface RefundService extends IService<MtRefund> {
      * @param accountInfo 操作人信息
      * throws BusinessCheckException;
      * */
-    Boolean doRefund(Integer orderId, String refundAmount, String remark, AccountInfo accountInfo) throws BusinessCheckException;
+    Boolean doRefund(Long orderId, String refundAmount, String remark, AccountInfo accountInfo) throws BusinessCheckException;
 
     /**
      * 获取售后订单总数

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

@@ -40,7 +40,7 @@ public interface SettlementService {
      * @throws BusinessCheckException
      * @return
      */
-    Boolean doConfirm(Integer settlementId, String operator) throws BusinessCheckException;
+    Boolean doConfirm(Long settlementIdupId, String operator) throws BusinessCheckException;
 
     /**
      * 获取结算详情
@@ -50,5 +50,5 @@ public interface SettlementService {
      * @param pageSize
      * @return
      * */
-    SettlementDto getSettlementInfo(Integer settlementId, Integer page, Integer pageSize) throws BusinessCheckException;
-}
+    SettlementDto getSettlementInfo(Long settlementIdupId, Integer page, Integer pageSize) throws BusinessCheckException;
+}

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

@@ -40,7 +40,7 @@ public interface SmsTemplateService extends IService<MtSmsTemplate> {
      * @param operator
      * @return
      * */
-    void deleteTemplate(Integer id, String operator) throws BusinessCheckException;
+    void deleteTemplate(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 根据模板ID获取模板信息
@@ -48,7 +48,7 @@ public interface SmsTemplateService extends IService<MtSmsTemplate> {
      * @param id ID
      * @throws BusinessCheckException
      */
-    MtSmsTemplate querySmsTemplateById(Integer id) throws BusinessCheckException;
+    MtSmsTemplate querySmsTemplateById(Long id) throws BusinessCheckException;
 
     /**
      * 根据条件搜索模板

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

@@ -23,7 +23,7 @@ public interface SourceService extends IService<TSource> {
      * @param status
      * @return
      */
-    List<TSource> getAvailableSources(Integer merchantId, String status);
+    List<TSource> getAvailableSources(Long merchantId, String status);
 
     /**
      * 获取菜单的属性结构
@@ -32,7 +32,7 @@ public interface SourceService extends IService<TSource> {
      * @param status 状态
      * @return
      */
-    List<TreeNode> getSourceTree(Integer merchantId, String status);
+    List<TreeNode> getSourceTree(Long merchantId, String status);
 
     /**
      * 根据菜单ID集合查询菜单列表信息

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

@@ -43,7 +43,7 @@ public interface StockService extends IService<MtStock> {
      * @param operator
      * @return
      * */
-    void delete(Integer id, String operator) throws BusinessCheckException;
+    void delete(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 根据ID获取信息

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

@@ -36,7 +36,7 @@ public interface UserActionService extends IService<MtUserAction> {
      * @param  id ID
      * @throws BusinessCheckException
      */
-    MtUserAction getUserActionDetail(Integer id) throws BusinessCheckException;
+    MtUserAction getUserActionDetail(Long id) throws BusinessCheckException;
 
     /**
      * 根据ID删除会员行为
@@ -45,5 +45,5 @@ public interface UserActionService extends IService<MtUserAction> {
      * @param operator 操作人
      * @throws BusinessCheckException
      */
-    void deleteUserAction(Integer id, String operator) throws BusinessCheckException;
+    void deleteUserAction(Long id, String operator) throws BusinessCheckException;
 }

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

@@ -61,7 +61,7 @@ public interface UserGradeService extends IService<MtUserGrade> {
      * @throws BusinessCheckException
      * @return
      */
-    Integer deleteUserGrade(Integer id, String operator) throws BusinessCheckException;
+    Long deleteUserGrade(Long id, String operator) throws BusinessCheckException;
 
     /**
      * 获取默认的会员等级
@@ -80,5 +80,5 @@ public interface UserGradeService extends IService<MtUserGrade> {
      * @throws BusinessCheckException
      * @return
      * */
-    List<MtUserGrade> getPayUserGradeList(Integer merchantId, MtUser userInfo) throws BusinessCheckException;
+    List<MtUserGrade> getPayUserGradeList(Long merchantId, MtUser userInfo) throws BusinessCheckException;
 }

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

@@ -376,7 +376,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
                 throw new BusinessCheckException("登录账号或密码有误");
             }
 
-            TAccount tAccount = getAccountInfoById(Math.toIntExact(accountInfo.getId()));
+            TAccount tAccount = getAccountInfoById(accountInfo.getId());
             String myPassword = tAccount.getPassword();
             String inputPassword = getEntryptPassword(password, tAccount.getSalt());
             if (!myPassword.equals(inputPassword) || !tAccount.getAccountStatus().toString().equals("1")) {

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

@@ -89,7 +89,7 @@ public class AddressServiceImpl extends ServiceImpl<MtAddressMapper, MtAddress>
      * @return
      */
     @Override
-    public MtAddress detail(Integer id) {
+    public MtAddress detail(Long id) {
         return mtAddressMapper.selectById(id);
     }
 

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

@@ -229,7 +229,7 @@ public class AlipayServiceImpl implements AlipayService {
      * @param platform 订单平台
      * @return
      * */
-    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("AlipayService.doRefund orderSn = {}, totalFee = {}, refundFee = {}", orderSn, totalAmount, refundAmount);
             if (StringUtil.isEmpty(orderSn)) {

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

@@ -79,7 +79,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
             lambdaQueryWrapper.eq(MtArticle::getMerchantId, merchantId);
         }
         String merchantNo = paginationRequest.getSearchParams().get("merchantNo") == null ? "" : paginationRequest.getSearchParams().get("merchantNo").toString();
-        Integer mchId = merchantService.getMerchantId(merchantNo);
+        Long mchId = merchantService.getMerchantId(merchantNo);
         if (mchId > 0) {
             lambdaQueryWrapper.eq(MtArticle::getMerchantId, mchId);
         }
@@ -125,7 +125,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         MtArticle mtArticle = new MtArticle();
         mtArticle.setTitle(articleDto.getTitle());
         mtArticle.setBrief(articleDto.getBrief());
-        Integer storeId = articleDto.getStoreId() == null ? 0 : articleDto.getStoreId();
+        Long storeId = articleDto.getStoreId() == null ? 0 : articleDto.getStoreId();
         if (articleDto.getMerchantId() == null || articleDto.getMerchantId() <= 0) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null) {
@@ -149,7 +149,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         mtArticle.setCreateTime(new Date());
         mtArticle.setSort(articleDto.getSort());
         mtArticle.setMerchantId(articleDto.getMerchantId());
-        Integer id = mtArticleMapper.insert(mtArticle);
+        int id = mtArticleMapper.insert(mtArticle);
         if (id > 0) {
             return mtArticle;
         } else {
@@ -164,7 +164,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
      * @return
      */
     @Override
-    public MtArticle queryArticleById(Integer articleId) {
+    public MtArticle queryArticleById(Long articleId) {
         return mtArticleMapper.selectById(articleId);
     }
 
@@ -175,7 +175,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
      * @return
      */
     @Override
-    public ArticleDto getArticleDetail(Integer articleId) {
+    public ArticleDto getArticleDetail(Long articleId) {
         MtArticle mtArticle = mtArticleMapper.selectById(articleId);
         ArticleDto articleDto = new ArticleDto();
         BeanUtils.copyProperties(mtArticle, articleDto);

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

@@ -108,7 +108,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             if (StringUtil.isEmpty(merchantId)) {
                 merchantId = "0";
             }
-            MtUser userInfo = memberService.queryMemberByUserNo(Integer.parseInt(merchantId), userNo);
+            MtUser userInfo = memberService.queryMemberByUserNo(Long.valueOf(merchantId), userNo);
             if (userInfo != null) {
                 lambdaQueryWrapper.eq(MtBalance::getUserId, userInfo.getId());
             }
@@ -244,12 +244,12 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
             throw new BusinessCheckException("单次充值金额不能大于20000");
         }
 
-        List<Integer> userIdArr = new ArrayList<>();
+        List<Long> userIdArr = new ArrayList<>();
         List<String> userIdList = Arrays.asList(userIds.split(","));
         if (userIdList != null && userIdList.size() > 0) {
             for (String userId : userIdList) {
                 if (StringUtil.isNotEmpty(userId) && !userIdArr.contains(Integer.parseInt(userId))) {
-                    userIdArr.add(Integer.parseInt(userId));
+                    userIdArr.add(Long.valueOf(userId));
                 }
             }
         }
@@ -260,7 +260,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         mtUserMapper.updateUserBalance(accountInfo.getMerchantId(), userIdArr, balanceAmount);
 
         if (userIdArr.size() > 0) {
-            for (Integer userId : userIdArr) {
+            for (Long userId : userIdArr) {
                 MtBalance mtBalance = new MtBalance();
                 mtBalance.setAmount(new BigDecimal(amount));
                 mtBalance.setUserId(userId);
@@ -272,7 +272,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         } else {
             MtBalance mtBalance = new MtBalance();
             mtBalance.setAmount(new BigDecimal(amount));
-            mtBalance.setUserId(0); // userId为0表示全体会员
+            mtBalance.setUserId(0L); // userId为0表示全体会员
             mtBalance.setMerchantId(accountInfo.getMerchantId());
             mtBalance.setDescription(remark);
             mtBalance.setOperator(accountInfo.getAccountName());

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

@@ -107,7 +107,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
     public MtBanner addBanner(BannerDto bannerDto) throws BusinessCheckException {
         MtBanner mtBanner = new MtBanner();
         BeanUtils.copyProperties(bannerDto, mtBanner);
-        Integer storeId = bannerDto.getStoreId() == null ? 0 : bannerDto.getStoreId();
+        Long storeId = bannerDto.getStoreId() == null ? 0 : bannerDto.getStoreId();
         if (bannerDto.getMerchantId() == null || bannerDto.getMerchantId() <= 0) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null) {
@@ -122,7 +122,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
         mtBanner.setUpdateTime(new Date());
         mtBanner.setCreateTime(new Date());
         mtBanner.setPosition(bannerDto.getPosition());
-        Integer id = mtBannerMapper.insert(mtBanner);
+        int id = mtBannerMapper.insert(mtBanner);
         if (id > 0) {
             return mtBanner;
         } else {
@@ -138,7 +138,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
      * @return
      */
     @Override
-    public MtBanner queryBannerById(Integer id) {
+    public MtBanner queryBannerById(Long id) {
         return mtBannerMapper.selectById(id);
     }
 
@@ -152,7 +152,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "删除Banner图")
-    public void deleteBanner(Integer id, String operator) {
+    public void deleteBanner(Long id, String operator) {
         MtBanner mtBanner = queryBannerById(id);
         if (null == mtBanner) {
             return;

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

@@ -104,7 +104,7 @@ public class BookCateServiceImpl extends ServiceImpl<MtBookCateMapper, MtBookCat
     @OperationServiceLog(description = "添加预约分类")
     public MtBookCate addBookCate(MtBookCate mtBookCate) throws BusinessCheckException {
         MtBookCate bookCate = new MtBookCate();
-        Integer storeId = mtBookCate.getStoreId() == null ? 0 : mtBookCate.getStoreId();
+        Long storeId = mtBookCate.getStoreId() == null ? 0 : mtBookCate.getStoreId();
         if (mtBookCate.getMerchantId() == null || mtBookCate.getMerchantId() <= 0) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null && mtStore.getMerchantId() != null) {
@@ -130,7 +130,7 @@ public class BookCateServiceImpl extends ServiceImpl<MtBookCateMapper, MtBookCat
         bookCate.setSort(mtBookCate.getSort());
         bookCate.setOperator(mtBookCate.getOperator());
         bookCate.setMerchantId(mtBookCate.getMerchantId());
-        Integer id = mtBookCateMapper.insert(bookCate);
+        int id = mtBookCateMapper.insert(bookCate);
         if (id > 0) {
             return bookCate;
         } else {
@@ -146,7 +146,7 @@ public class BookCateServiceImpl extends ServiceImpl<MtBookCateMapper, MtBookCat
      * @return
      */
     @Override
-    public MtBookCate getBookCateById(Integer id) {
+    public MtBookCate getBookCateById(Long id) {
         return mtBookCateMapper.selectById(id);
     }
 

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

@@ -138,7 +138,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
     @Override
     @OperationServiceLog(description = "新增预约订单")
     public MtBookItem addBookItem(MtBookItem mtBookItem) throws BusinessCheckException {
-        Integer storeId = mtBookItem.getStoreId() == null ? 0 : mtBookItem.getStoreId();
+        Long storeId = mtBookItem.getStoreId() == null ? 0 : mtBookItem.getStoreId();
         if (mtBookItem.getMerchantId() == null || mtBookItem.getMerchantId() <= 0) {
             throw new BusinessCheckException("新增预约订单失败：所属商户不能为空！");
         }
@@ -173,7 +173,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
         mtBookItem.setUpdateTime(new Date());
         mtBookItem.setCreateTime(new Date());
         mtBookItem.setVerifyCode(SeqUtil.getRandomNumber(6));
-        Integer id = mtBookItemMapper.insert(mtBookItem);
+        int id = mtBookItemMapper.insert(mtBookItem);
         if (id > 0) {
             return mtBookItem;
         } else {
@@ -189,7 +189,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
      * @return
      */
     @Override
-    public MtBookItem getBookItemById(Integer id) {
+    public MtBookItem getBookItemById(Long id) {
         return mtBookItemMapper.selectById(id);
     }
 
@@ -201,7 +201,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
      * @return
      */
     @Override
-    public BookItemDto getBookDetail(Integer id) throws BusinessCheckException {
+    public BookItemDto getBookDetail(Long id) throws BusinessCheckException {
         MtBookItem mtBookItem = mtBookItemMapper.selectById(id);
         if (mtBookItem == null) {
             throw new BusinessCheckException("预约不存在.");
@@ -319,7 +319,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
      * */
     @Override
     @Transactional
-    public Boolean cancelBook(Integer id, String remark) throws BusinessCheckException {
+    public Boolean cancelBook(Long id, String remark) throws BusinessCheckException {
         MtBookItem mtBookItem = getBookItemById(id);
         if (mtBookItem == null) {
             throw new BusinessCheckException("该预约订单信息异常");

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

@@ -131,7 +131,7 @@ public class BookServiceImpl extends ServiceImpl<MtBookMapper, MtBook> implement
     @Override
     @OperationServiceLog(description = "添加预约项目")
     public MtBook addBook(MtBook mtBook) throws BusinessCheckException {
-        Integer storeId = mtBook.getStoreId() == null ? 0 : mtBook.getStoreId();
+        Long storeId = mtBook.getStoreId() == null ? 0 : mtBook.getStoreId();
         if (mtBook.getMerchantId() == null || mtBook.getMerchantId() <= 0) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null) {
@@ -151,7 +151,7 @@ public class BookServiceImpl extends ServiceImpl<MtBookMapper, MtBook> implement
         mtBook.setStatus(StatusEnum.ENABLED.getKey());
         mtBook.setUpdateTime(new Date());
         mtBook.setCreateTime(new Date());
-        Integer id = mtBookMapper.insert(mtBook);
+        int id = mtBookMapper.insert(mtBook);
         if (id > 0) {
             return mtBook;
         } else {
@@ -167,7 +167,7 @@ public class BookServiceImpl extends ServiceImpl<MtBookMapper, MtBook> implement
      * @return
      */
     @Override
-    public BookDto getBookById(Integer id) throws ParseException {
+    public BookDto getBookById(Long id) throws ParseException {
         BookDto bookDto = new BookDto();
         MtBook mtBook = mtBookMapper.selectById(id);
         if (mtBook == null) {

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

@@ -120,7 +120,7 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         if (null != reqDto.getId()) {
             mtCate.setId(reqDto.getId());
         }
-        Integer storeId = reqDto.getStoreId() == null ? 0 : reqDto.getStoreId();
+        Long storeId = reqDto.getStoreId() == null ? 0 : reqDto.getStoreId();
         if (storeId > 0 && (reqDto.getMerchantId() == null || reqDto.getMerchantId() <= 0)) {
             MtStore mtStore = storeService.queryStoreById(storeId);
             if (mtStore != null) {
@@ -150,7 +150,7 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
      * @throws BusinessCheckException
      */
     @Override
-    public MtGoodsCate queryCateById(Integer id) {
+    public MtGoodsCate queryCateById(Long id) {
         return cateMapper.selectById(id);
     }
 
@@ -163,7 +163,7 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
      */
     @Override
     @OperationServiceLog(description = "删除商品分类")
-    public void deleteCate(Integer id, String operator) throws BusinessCheckException {
+    public void deleteCate(Long id, String operator) throws BusinessCheckException {
         MtGoodsCate cateInfo = queryCateById(id);
 
         Map<String, Object> params = new HashMap<>();

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

@@ -214,17 +214,17 @@ public class CommissionCashServiceImpl extends ServiceImpl<MtCommissionCashMappe
         }
         staffIds.addAll(userIds);
         // 生成结算数据
-        if (staffIds.size() > 0) {
+        if (!staffIds.isEmpty()) {
             for (String staffId : staffIds) {
                  BigDecimal totalAmount = new BigDecimal("0");
-                 Integer cashMerchantId = 0;
-                 Integer cashStoreId = 0;
+                 Long cashMerchantId = 0L;
+                Long cashStoreId = 0l;
                  String settleNo = CommonUtil.createSettlementNo();
-                 Integer targetId;
+                Long targetId;
                  if (staffId.indexOf(CommissionTargetEnum.STAFF.getKey()) >= 0) {
-                     targetId = Integer.parseInt(staffId.replaceAll(CommissionTargetEnum.STAFF.getKey(), ""));
+                     targetId = Long.parseLong(staffId.replaceAll(CommissionTargetEnum.STAFF.getKey(), ""));
                  } else {
-                     targetId = Integer.parseInt(staffId.replaceAll(CommissionTargetEnum.MEMBER.getKey(), ""));
+                     targetId = Long.parseLong(staffId.replaceAll(CommissionTargetEnum.MEMBER.getKey(), ""));
                  }
                  for (MtCommissionLog mtCommissionLog : commissionLogList) {
                       if (mtCommissionLog.getStaffId().equals(targetId) || mtCommissionLog.getUserId().equals(targetId)) {
@@ -254,10 +254,10 @@ public class CommissionCashServiceImpl extends ServiceImpl<MtCommissionCashMappe
                  mtCommissionCash.setUuid(uuid);
                  if (staffId.indexOf(CommissionTargetEnum.STAFF.getKey()) >= 0) {
                      mtCommissionCash.setStaffId(targetId);
-                     mtCommissionCash.setUserId(0);
+                     mtCommissionCash.setUserId(0L);
                  } else {
                      mtCommissionCash.setUserId(targetId);
-                     mtCommissionCash.setStaffId(0);
+                     mtCommissionCash.setStaffId(0L);
                  }
                  if (cashStoreId > 0) {
                      mtCommissionCash.setStoreId(cashStoreId);
@@ -284,7 +284,7 @@ public class CommissionCashServiceImpl extends ServiceImpl<MtCommissionCashMappe
      * @return
      */
     @Override
-    public CommissionCashDto queryCommissionCashById(Integer id) {
+    public CommissionCashDto queryCommissionCashById(Long id) {
         MtCommissionCash mtCommissionCash = mtCommissionCashMapper.selectById(id);
         CommissionCashDto commissionCashDto = null;
         if (mtCommissionCash != null) {

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

@@ -189,13 +189,13 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
     @Override
     @Transactional
     @OperationServiceLog(description = "计算订单分销提成")
-    public void calculateCommission(Integer orderId) throws BusinessCheckException {
+    public void calculateCommission(Long orderId) throws BusinessCheckException {
         if (orderId != null && orderId > 0) {
             MtOrder mtOrder = orderService.getById(orderId);
             // 商品订单佣金计算
             if (mtOrder != null && mtOrder.getType().equals(CommissionTypeEnum.GOOGS.getKey())) {
                 // 获取分销关系
-                Integer commissionUserId = mtCommissionRelationMapper.getCommissionUserId(mtOrder.getMerchantId(), mtOrder.getUserId());
+                Long commissionUserId = mtCommissionRelationMapper.getCommissionUserId(mtOrder.getMerchantId(), mtOrder.getUserId());
                 if (commissionUserId != null && commissionUserId > 0) {
                     mtOrder.setCommissionUserId(commissionUserId);
                     orderService.updateOrder(mtOrder);
@@ -206,7 +206,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                 List<MtOrderGoods> goodsList = mtOrderGoodsMapper.selectByMap(params);
                 if (goodsList != null && goodsList.size() > 0) {
                     for (MtOrderGoods orderGoods : goodsList) {
-                         Integer goodsId = orderGoods.getGoodsId();
+                         Long goodsId = orderGoods.getGoodsId();
                          LambdaQueryWrapper<MtCommissionRuleItem> lambdaQueryWrapper = Wrappers.lambdaQuery();
                          lambdaQueryWrapper.eq(MtCommissionRuleItem::getMerchantId, mtOrder.getMerchantId());
                          lambdaQueryWrapper.eq(MtCommissionRuleItem::getTargetId, goodsId);
@@ -229,7 +229,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                                  // 员工提成计算，员工信息不能为空
                                  if (mtOrder.getStaffId() > 0 && mtCommissionRule.getTarget().equals(CommissionTargetEnum.STAFF.getKey())) {
                                      if (mtOrder.getStaffId() != null && mtOrder.getStaffId() > 0) {
-                                         addCommissionLog(mtOrder, mtCommissionRule, amount, mtCommissionRuleItem, 0);
+                                         addCommissionLog(mtOrder, mtCommissionRule, amount, mtCommissionRuleItem, 0L);
                                      }
                                  }
 
@@ -261,7 +261,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
                         rate = mtCommissionRuleItem.getGuest();
                     }
                     BigDecimal amount = mtOrder.getAmount().multiply(rate.divide(new BigDecimal("100")));
-                    addCommissionLog(mtOrder, mtCommissionRule, amount, mtCommissionRuleItem, 0);
+                    addCommissionLog(mtOrder, mtCommissionRule, amount, mtCommissionRuleItem, 0L);
                 }
             }
 
@@ -281,7 +281,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
      * @return
      */
     @Override
-    public CommissionLogDto queryCommissionLogById(Integer id) {
+    public CommissionLogDto queryCommissionLogById(Long id) {
         MtCommissionLog mtCommissionLog = mtCommissionLogMapper.selectById(id);
         CommissionLogDto commissionLogDto = null;
         if (mtCommissionLog != null) {
@@ -334,7 +334,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
      * */
     @Transactional
     @OperationServiceLog(description = "新增分销提成记录")
-    public void addCommissionLog(MtOrder mtOrder, MtCommissionRule mtCommissionRule, BigDecimal amount, MtCommissionRuleItem mtCommissionRuleItem, Integer userId) {
+    public void addCommissionLog(MtOrder mtOrder, MtCommissionRule mtCommissionRule, BigDecimal amount, MtCommissionRuleItem mtCommissionRuleItem, Long userId) {
         MtCommissionLog mtCommissionLog = new MtCommissionLog();
         mtCommissionLog.setType(mtOrder.getType());
         mtCommissionLog.setTarget(mtCommissionRule.getTarget());

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

@@ -78,7 +78,7 @@ public class CommissionRelationServiceImpl extends ServiceImpl<MtCommissionRelat
 
         String merchantNo = paginationRequest.getSearchParams().get("merchantNo") == null ? "" : paginationRequest.getSearchParams().get("merchantNo").toString();
         if (StringUtils.isNotBlank(merchantNo) && StringUtil.isEmpty(merchantId)) {
-            Integer mchId = merchantService.getMerchantId(merchantNo);
+            Long mchId = merchantService.getMerchantId(merchantNo);
             if (mchId != null && mchId > 0) {
                 merchantId = mchId.toString();
             }
@@ -128,7 +128,7 @@ public class CommissionRelationServiceImpl extends ServiceImpl<MtCommissionRelat
             return;
         }
 
-        MtUser shareUserInfo = memberService.queryMemberById(Integer.parseInt(shareId));
+        MtUser shareUserInfo = memberService.queryMemberById(Long.parseLong(shareId));
         if (shareUserInfo == null) {
             return;
         }
@@ -143,7 +143,7 @@ public class CommissionRelationServiceImpl extends ServiceImpl<MtCommissionRelat
             mtCommissionRelation.setCreateTime(new Date());
             mtCommissionRelation.setUpdateTime(new Date());
             mtCommissionRelation.setStatus(StatusEnum.ENABLED.getKey());
-            mtCommissionRelation.setUserId(Integer.parseInt(shareId));
+            mtCommissionRelation.setUserId(Long.parseLong(shareId));
             mtCommissionRelation.setSubUserId(userInfo.getId());
             mtCommissionRelation.setMerchantId(userInfo.getMerchantId());
             mtCommissionRelation.setInviteCode(shareUserInfo.getUserNo());

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

@@ -168,7 +168,7 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
      * @return
      */
     @Override
-    public CommissionRuleDto queryCommissionRuleById(Integer id) throws BusinessCheckException {
+    public CommissionRuleDto queryCommissionRuleById(Long id) throws BusinessCheckException {
         MtCommissionRule mtCommissionRule = mtCommissionRuleMapper.selectById(id);
         if (mtCommissionRule == null) {
             return null;
@@ -261,7 +261,7 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
 
         // 更新或插入
         Date date = new Date();
-        List<Integer> itemIds = new ArrayList<>();
+        List<Long> itemIds = new ArrayList<>();
         if (commissionRule.getDetailList() != null && commissionRule.getDetailList().size() > 0) {
             for (CommissionRuleItemParam itemParam : commissionRule.getDetailList()) {
                 MtCommissionRuleItem mtCommissionRuleItem = new MtCommissionRuleItem();

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

@@ -123,7 +123,7 @@ public class ConfirmLogServiceImpl extends ServiceImpl<MtConfirmLogMapper, MtCon
      * @return
      * */
     @Override
-    public Long getConfirmNum(Integer userCouponId) {
+    public Long getConfirmNum(Long userCouponId) {
         if (userCouponId > 0) {
             return mtConfirmLogMapper.getConfirmNum(userCouponId);
         } else {
@@ -137,7 +137,7 @@ public class ConfirmLogServiceImpl extends ServiceImpl<MtConfirmLogMapper, MtCon
      * @return
      * */
     @Override
-    public List<MtConfirmLog> getConfirmList(Integer userCouponId) {
+    public List<MtConfirmLog> getConfirmList(Long userCouponId) {
         if (userCouponId == null || userCouponId <= 0) {
             return new ArrayList<>();
         }

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

@@ -171,7 +171,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      * @throws BusinessCheckException
      */
     @Override
-    public MtCouponGroup queryCouponGroupById(Integer id) {
+    public MtCouponGroup queryCouponGroupById(Long id) {
         return mtCouponGroupMapper.selectById(id);
     }
 
@@ -184,7 +184,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      */
     @Override
     @OperationServiceLog(description = "删除卡券分组")
-    public void deleteCouponGroup(Integer id, String operator) {
+    public void deleteCouponGroup(Long id, String operator) {
         MtCouponGroup couponGroup = queryCouponGroupById(id);
         if (null == couponGroup) {
             return;
@@ -237,7 +237,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer getCouponNum(Integer id) {
+    public Integer getCouponNum(Long id) {
         Long num = mtCouponMapper.queryNumByGroupId(id);
         return num.intValue();
     }
@@ -250,8 +250,8 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public BigDecimal getCouponMoney(Integer groupId) {
-        List<MtCoupon> couponList = mtCouponMapper.queryByGroupId(groupId.intValue());
+    public BigDecimal getCouponMoney(Long groupId) {
+        List<MtCoupon> couponList = mtCouponMapper.queryByGroupId(groupId);
         MtCouponGroup groupInfo = queryCouponGroupById(groupId);
         BigDecimal money = BigDecimal.valueOf(0);
         if (couponList.size() > 0) {
@@ -271,7 +271,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      * @throws BusinessCheckException
      * */
     @Override
-    public Integer getSendNum(Integer couponId) {
+    public Integer getSendNum(Long couponId) {
         Long num = mtUserCouponMapper.getSendNum(couponId);
         return num.intValue();
     }
@@ -366,7 +366,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
             item.setMobile(mobile);
             item.setGroupId(groupIdArr);
             item.setNum(numArr);
-            item.setMerchantId(Integer.parseInt(merchantId));
+            item.setMerchantId(Long.valueOf(merchantId));
             rows.add(item);
         }
 
@@ -422,9 +422,9 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
 
              Integer totalNum = couponInfo.getTotal() == null ? 0 : couponInfo.getTotal();
              Integer sendNum = couponIdMap.get(couponId);
-             Integer hasSendNum = getSendNum(Integer.parseInt(couponId));
+             Integer hasSendNum = getSendNum(Long.valueOf(couponId));
              if (totalNum > 0 && ((totalNum - hasSendNum) < sendNum)) {
-                 Integer needNum = sendNum - (totalNum - hasSendNum);
+                 int needNum = sendNum - (totalNum - hasSendNum);
                  if (StringUtil.isNotBlank(errorMsgNoNum.toString())) {
                      errorMsgNoNum.append(";卡券ID:" + couponId + "存量不足,至少再添加" + needNum + "套");
                  } else {
@@ -459,7 +459,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                     MtCouponGroup mtCouponGroup = getById(cellDto.getGroupId().get(gid).intValue());
                     MtUser mtUser = memberService.queryMemberByMobile(mtCouponGroup.getMerchantId(), cellDto.getMobile());
                     couponService.sendCoupon(cellDto.getGroupId().get(gid).longValue(), mtUser.getId(), cellDto.getNum().get(gid), false, uuid, operator);
-                    List<MtCoupon> couponList = couponService.queryCouponListByGroupId(cellDto.getGroupId().get(gid).intValue());
+                    List<MtCoupon> couponList = couponService.queryCouponListByGroupId(Long.valueOf(cellDto.getGroupId().get(gid)));
                     // 累加总张数、总价值
                     for (MtCoupon coupon : couponList) {
                          totalNum = totalNum + (coupon.getSendNum()*cellDto.getNum().get(gid));
@@ -477,8 +477,8 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                 dto.setUserId(mtUser.getId());
                 dto.setFileName(originalFileName);
                 dto.setFilePath(filePath);
-                dto.setGroupId(0);
-                dto.setCouponId(0);
+                dto.setGroupId(0L);
+                dto.setCouponId(0L);
                 dto.setGroupName("");
                 dto.setSendNum(0);
                 dto.setOperator(operator);
@@ -540,7 +540,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
      *
      * @param groupId 分组ID
      * */
-    public GroupDataDto getGroupData(Integer groupId, HttpServletRequest request, Model model) throws BusinessCheckException {
+    public GroupDataDto getGroupData(Long groupId, HttpServletRequest request, Model model) throws BusinessCheckException {
         MtCouponGroup groupInfo = queryCouponGroupById(groupId);
 
         // 已发放套数

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

@@ -320,7 +320,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
                    if (StringUtil.isNotEmpty(goodsIds[n])) {
                        MtCouponGoods mtCouponGoods = new MtCouponGoods();
                        mtCouponGoods.setCouponId(couponInfo.getId());
-                       mtCouponGoods.setGoodsId(Integer.parseInt(goodsIds[n]));
+                       mtCouponGoods.setGoodsId(Long.valueOf(goodsIds[n]));
                        mtCouponGoods.setStatus(StatusEnum.ENABLED.getKey());
                        mtCouponGoods.setCreateTime(new Date());
                        mtCouponGoods.setUpdateTime(new Date());
@@ -345,7 +345,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
                     userCoupon.setCouponId(couponInfo.getId());
                     userCoupon.setGroupId(mtCoupon.getGroupId());
                     userCoupon.setMobile("");
-                    userCoupon.setUserId(0);
+                    userCoupon.setUserId(0L);
                     userCoupon.setStatus(UserCouponStatusEnum.UNSEND.getKey());
                     userCoupon.setCreateTime(new Date());
                     userCoupon.setUpdateTime(new Date());
@@ -381,7 +381,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
 
                     userCoupon.setAmount(couponInfo.getAmount());
                     userCoupon.setBalance(couponInfo.getAmount());
-                    userCoupon.setStoreId(0);
+                    userCoupon.setStoreId(0L);
                     userCoupon.setOperator(reqCouponDto.getOperator());
                     userCoupon.setImage(couponInfo.getImage());
 
@@ -408,7 +408,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
      * @return
      */
     @Override
-    public MtCoupon queryCouponById(Integer id) {
+    public MtCoupon queryCouponById(Long id) {
         return mtCouponMapper.selectById(id);
     }
 
@@ -424,7 +424,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     @OperationServiceLog(description = "删除卡券")
     @Transactional(rollbackFor = Exception.class)
     public void deleteCoupon(Long id, String operator) throws BusinessCheckException {
-        MtCoupon couponInfo = queryCouponById(id.intValue());
+        MtCoupon couponInfo = queryCouponById(id);
         if (null == couponInfo) {
             throw new BusinessCheckException("卡券不存在");
         }
@@ -449,10 +449,10 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         Integer pageSize = couponListParam.getPageSize() == null ? Constants.PAGE_SIZE : couponListParam.getPageSize();
         String status = couponListParam.getStatus() == null ? StatusEnum.ENABLED.getKey() : couponListParam.getStatus();
         String type = couponListParam.getType() == null ? "" : couponListParam.getType();
-        Integer userId = couponListParam.getUserId() == null ? 0 : couponListParam.getUserId();
+        Long userId = couponListParam.getUserId() == null ? 0 : couponListParam.getUserId();
         Integer needPoint = couponListParam.getNeedPoint() == null ? 0 : couponListParam.getNeedPoint();
         String sendWay = couponListParam.getSendWay() == null ? "front" : couponListParam.getSendWay();
-        Integer merchantId = couponListParam.getMerchantId() == null ? 0 : couponListParam.getMerchantId();
+        Long merchantId = couponListParam.getMerchantId() == null ? 0 : couponListParam.getMerchantId();
 
         Page<MtCoupon> pageHelper = PageHelper.startPage(pageNumber, pageSize);
         LambdaQueryWrapper<MtCoupon> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -578,8 +578,8 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
      * @param groupId 查询参数
      * @return
      * */
-    public List<MtCoupon> queryCouponListByGroupId(Integer groupId) {
-        return mtCouponMapper.queryByGroupId(groupId.intValue());
+    public List<MtCoupon> queryCouponListByGroupId(Long groupId) {
+        return mtCouponMapper.queryByGroupId(groupId);
     }
 
     /**
@@ -597,7 +597,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "发放卡券")
-    public void sendCoupon(Integer couponId, Integer userId, Integer num, Boolean sendMessage, String uuid, String operator) throws BusinessCheckException {
+    public void sendCoupon(Long couponId, Long userId, Integer num, Boolean sendMessage, String uuid, String operator) throws BusinessCheckException {
         MtCoupon couponInfo = queryCouponById(couponId);
         MtUser userInfo = memberService.queryMemberById(userId);
 
@@ -751,14 +751,14 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "发放卡券")
-    public Boolean batchSendCoupon(Integer couponId, List<Integer> userIds, Integer num, String uuid, String operator) throws BusinessCheckException {
+    public Boolean batchSendCoupon(Long couponId, List<Long> userIds, Integer num, String uuid, String operator) throws BusinessCheckException {
        if (userIds == null || userIds.size() < 1) {
            throw new BusinessCheckException("发放对象异常，卡券发放失败");
        }
        // 发放人数大于10就不发送消息了
        Boolean sendMsg = userIds.size() >= 10 ? false : true;
        if (userIds != null && userIds.size() > 0) {
-           for (Integer userId : userIds) {
+           for (Long userId : userIds) {
                 sendCoupon(couponId, userId, num, sendMsg, uuid, operator);
            }
        }
@@ -877,12 +877,12 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         // 判断适用会员等级
         if (userCoupon.getUserId() != null && userCoupon.getUserId() > 0 && StringUtil.isNotEmpty(couponInfo.getGradeIds())) {
             MtUser mtUser = memberService.queryMemberById(userCoupon.getUserId());
-            if (StringUtil.isEmpty(mtUser.getGradeId())) {
+            if (Objects.isNull(mtUser.getGradeId())) {
                 MtUserGrade defaultGrade = userGradeService.getInitUserGrade(mtUser.getMerchantId());
                 if (defaultGrade != null) {
-                    mtUser.setGradeId(defaultGrade.getId().toString());
+                    mtUser.setGradeId(defaultGrade.getId());
                 } else {
-                    mtUser.setGradeId("0");
+                    mtUser.setGradeId(0L);
                 }
             }
             String[] gradeIds = couponInfo.getGradeIds().split(",");
@@ -995,7 +995,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
      */
     @Override
     @OperationServiceLog(description = "删除会员卡券")
-    public void deleteUserCoupon(Integer id, String operator) throws BusinessCheckException {
+    public void deleteUserCoupon(Long id, String operator) throws BusinessCheckException {
         MtUserCoupon userCoupon = mtUserCouponMapper.selectById(id);
         if (null == userCoupon) {
             return;
@@ -1031,7 +1031,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "撤销卡券核销")
-    public void rollbackUserCoupon(Integer id, Integer userCouponId,String operator) throws BusinessCheckException {
+    public void rollbackUserCoupon(Long id, Integer userCouponId,String operator) throws BusinessCheckException {
         MtConfirmLog mtConfirmLog = mtConfirmLogMapper.selectById(id);
         MtUserCoupon userCoupon = mtUserCouponMapper.selectById(userCouponId);
 
@@ -1101,7 +1101,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
      * @return
      * */
     @Override
-    public MtUserCoupon queryUserCouponById(Integer userCouponId) {
+    public MtUserCoupon queryUserCouponById(Long userCouponId) {
         return mtUserCouponMapper.selectById(userCouponId);
     }
 
@@ -1122,14 +1122,14 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
 
         Integer total = paginationResponse.size();
 
-        List<Integer> coupondIdList = mtUserCouponMapper.getCouponIdsByUuid(uuid);
-        List<Integer> couponIds = new ArrayList<>();
-        couponIds.add(0);
+        List<Long> coupondIdList = mtUserCouponMapper.getCouponIdsByUuid(uuid);
+        List<Long> couponIds = new ArrayList<>();
+        couponIds.add(0L);
 
         Date nowDate = new Date();
 
         for (int i = 0; i < coupondIdList.size(); i++) {
-            Integer couponId = coupondIdList.get(i);
+            Long couponId = coupondIdList.get(i);
             MtCoupon couponInfo = queryCouponById(couponId);
             if (couponInfo.getStatus().equals(StatusEnum.ENABLED.getKey()) && couponInfo.getEndTime().after(nowDate)) {
                 couponIds.add(couponId);
@@ -1226,7 +1226,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean removeCoupon(Integer userCouponId, Integer userId) throws BusinessCheckException {
+    public boolean removeCoupon(Integer userCouponId, Long userId) throws BusinessCheckException {
         MtUserCoupon userCoupon = mtUserCouponMapper.selectById(userCouponId);
         if (null == userCoupon) {
             throw new BusinessCheckException("删除失败：该卡券不存在！");

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

@@ -198,7 +198,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      * @return
      */
     @Override
-    public List<Long> getSourceIdsByDutyId(Integer dutyId) {
+    public List<Long> getSourceIdsByDutyId(Long dutyId) {
         return tDutySourceMapper.findSourceIdsByDutyId(dutyId);
     }
 
@@ -275,7 +275,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
      */
     @Override
     public List<TreeNode> getDutyTree(Long merchantId) {
-        List<TDuty> tDuties = getAvailableRoles(merchantId, 0);
+        List<TDuty> tDuties = getAvailableRoles(merchantId, 0L);
         List<TreeNode> trees = new ArrayList<TreeNode>();
         if (tDuties != null && tDuties.size() > 0) {
             TreeNode sourceTreeNode;

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

@@ -95,7 +95,7 @@ public class GenCodeServiceImpl implements GenCodeService {
         Date dateTime = new Date();
         tGenCode.setCreateTime(dateTime);
         tGenCode.setUpdateTime(dateTime);
-        Integer id = tGenCodeMapper.insert(tGenCode);
+        int id = tGenCodeMapper.insert(tGenCode);
         if (id > 0) {
             return tGenCode;
         } else {
@@ -110,7 +110,7 @@ public class GenCodeServiceImpl implements GenCodeService {
      * @param id 生成代码ID
      */
     @Override
-    public TGenCode queryGenCodeById(Integer id) {
+    public TGenCode queryGenCodeById(Long id) {
         return tGenCodeMapper.selectById(id);
     }
 

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

@@ -156,9 +156,9 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         String couponId = giveParam.getCouponId() == null ? "" : giveParam.getCouponId();
         String note = giveParam.getNote() == null ? "" : giveParam.getNote();
         String message = giveParam.getMessage() == null ? "" : giveParam.getMessage();
-        Integer userId = giveParam.getUserId() == null ? 0 : giveParam.getUserId();
-        Integer storeId = giveParam.getStoreId() == null ? 0 : giveParam.getStoreId();
-        Integer merchantId = giveParam.getMerchantId() == null ? 0 : giveParam.getMerchantId();
+        Long userId = giveParam.getUserId() == null ? 0 : giveParam.getUserId();
+        Long storeId = giveParam.getStoreId() == null ? 0 : giveParam.getStoreId();
+        Long merchantId = giveParam.getMerchantId() == null ? 0 : giveParam.getMerchantId();
 
         if (StringUtil.isEmpty(mobile) || mobile.length() > 11 || mobile.length() < 11) {
             throw new BusinessCheckException("转增对象手机号有误");
@@ -181,7 +181,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
             userInfo.setName(mobile);
             userInfo.setMobile(mobile);
             MtUserGrade grade = userGradeService.getInitUserGrade(merchantId);
-            userInfo.setGradeId(grade.getId()+"");
+            userInfo.setGradeId(grade.getId());
             userInfo.setBalance(new BigDecimal(0));
             userInfo.setStatus(StatusEnum.ENABLED.getKey());
             user = memberService.addMember(userInfo);

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

@@ -314,7 +314,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             String couponIds[] = mtGoods.getCouponIds().split(",");
             if (couponIds.length > 0) {
                 for (int i = 0; i < couponIds.length; i++) {
-                     MtCoupon mtCoupon = couponService.queryCouponById(Integer.parseInt(couponIds[i]));
+                     MtCoupon mtCoupon = couponService.queryCouponById(Long.valueOf(couponIds[i]));
                      if (mtCoupon == null) {
                          throw new BusinessCheckException("卡券ID等于“"+couponIds[i]+"”的虚拟卡券不存在.");
                      }
@@ -357,7 +357,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @return
      */
     @Override
-    public MtGoods queryGoodsByGoodsNo(Integer merchantId, String goodsNo) {
+    public MtGoods queryGoodsByGoodsNo(Long merchantId, String goodsNo) {
         return mtGoodsMapper.getByGoodsNo(merchantId, goodsNo);
     }
 
@@ -383,7 +383,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @throws BusinessCheckException
      */
     @Override
-    public GoodsDto getGoodsDetail(Integer id, boolean getDeleteSpec) {
+    public GoodsDto getGoodsDetail(Long id, boolean getDeleteSpec) {
         if (id == null || id < 1) {
             return null;
         }
@@ -680,7 +680,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @return
      * */
     @Override
-    public List<GoodsTopDto> getGoodsSaleTopList(Integer merchantId, Integer storeId, Date startTime, Date endTime) {
+    public List<GoodsTopDto> getGoodsSaleTopList(Long merchantId, Long storeId, Date startTime, Date endTime) {
         List<GoodsTopBean> dataList = mtGoodsMapper.getGoodsSaleTopList(merchantId, storeId, startTime, endTime);
         List<GoodsTopDto> goodsList = new ArrayList<>();
         if (dataList != null && dataList.size() > 0) {