diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java index 961d4d183..5b4c7a7b1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java @@ -1,19 +1,24 @@ package com.simple.controller; -import io.swagger.annotations.Api; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxAppinfo; import com.simple.service.WxAppinfoService; + +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxAppinfo") @@ -24,7 +29,7 @@ public class WxAppinfoController extends BaseController private WxAppinfoService wxAppinfoService; private Logger logger = Logger.getLogger(WxAppinfoController.class); - + @ApiOperation("") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java index 74eacb57e..061f580b9 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java @@ -46,26 +46,26 @@ public class WxBUserMerchant implements Serializable { private String tenantId; /*B端用户id**/ @io.swagger.annotations.ApiModelProperty(value="B端用户id",name="bUserId") - private Integer bUserId; + private Long bUserId; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Integer merchantId; + private Long merchantId; public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getBUserId() { + public Long getBUserId() { return bUserId; } - public void setBUserId(Integer _bUserId) { + public void setBUserId(Long _bUserId) { bUserId = _bUserId; } - public Integer getMerchantId() { + public Long getMerchantId() { return merchantId; } - public void setMerchantId(Integer _merchantId) { + public void setMerchantId(Long _merchantId) { merchantId = _merchantId; } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java index 71d05bd7a..caee5c124 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java @@ -46,7 +46,7 @@ public class WxCUserCars implements Serializable { private String tenantId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Integer cUserId; + private Long cUserId; /*车牌号**/ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") private String carNumber; @@ -56,10 +56,10 @@ public class WxCUserCars implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public String getCarNumber() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java index 70659ccd2..36bcab28f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java @@ -46,7 +46,7 @@ public class WxCUserCloud implements Serializable { private String tenantId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Integer cUserId; + private Long cUserId; /*大数据相关信息**/ @io.swagger.annotations.ApiModelProperty(value="大数据相关信息",name="cloudData") private String cloudData; @@ -56,10 +56,10 @@ public class WxCUserCloud implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public String getCloudData() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java index d38fb4114..28997d4ec 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java @@ -46,7 +46,7 @@ public class WxCUserEtcpToken implements Serializable { private String tenantId; /*c端用户ID**/ @io.swagger.annotations.ApiModelProperty(value="c端用户ID",name="cUserId") - private Integer cUserId; + private Long cUserId; /*etcp token**/ @io.swagger.annotations.ApiModelProperty(value="etcp token",name="etcpToken") private String etcpToken; @@ -62,10 +62,10 @@ public class WxCUserEtcpToken implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public String getEtcpToken() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java index 5095b836c..750b4267d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java @@ -46,7 +46,7 @@ public class WxCUserTags implements Serializable { private String tenantId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") - private Integer userId; + private Long userId; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="tags") private String tags; @@ -56,10 +56,10 @@ public class WxCUserTags implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getUserId() { + public Long getUserId() { return userId; } - public void setUserId(Integer _userId) { + public void setUserId(Long _userId) { userId = _userId; } public String getTags() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java index 7eb1b6bb7..dd5a043f3 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -46,10 +46,10 @@ public class WxCoupon implements Serializable { private String tenantId; /*卡券活动id**/ @io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="activityId") - private Integer activityId; + private Long activityId; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Integer merchantId; + private Long merchantId; /*券类型**/ @io.swagger.annotations.ApiModelProperty(value="券类型",name="type") private Integer type; @@ -92,16 +92,16 @@ public class WxCoupon implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getActivityId() { + public Long getActivityId() { return activityId; } - public void setActivityId(Integer _activityId) { + public void setActivityId(Long _activityId) { activityId = _activityId; } - public Integer getMerchantId() { + public Long getMerchantId() { return merchantId; } - public void setMerchantId(Integer _merchantId) { + public void setMerchantId(Long _merchantId) { merchantId = _merchantId; } public Integer getType() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java index 7318371a9..847a110b4 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java @@ -46,10 +46,10 @@ public class WxCouponActionLog implements Serializable { private String tenantId; /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") - private Integer couponId; + private Long couponId; /*用户id**/ @io.swagger.annotations.ApiModelProperty(value="用户id",name="userId") - private Integer userId; + private Long userId; /*优惠券操作(领取、支付,使用,核销等)**/ @io.swagger.annotations.ApiModelProperty(value="优惠券操作(领取、支付,使用,核销等)",name="action") private String action; @@ -62,16 +62,16 @@ public class WxCouponActionLog implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCouponId() { + public Long getCouponId() { return couponId; } - public void setCouponId(Integer _couponId) { + public void setCouponId(Long _couponId) { couponId = _couponId; } - public Integer getUserId() { + public Long getUserId() { return userId; } - public void setUserId(Integer _userId) { + public void setUserId(Long _userId) { userId = _userId; } public String getAction() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java index eb72acbe0..c62cd1f11 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java @@ -46,7 +46,7 @@ public class WxCouponActivity implements Serializable { private String tenantId; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Integer merchantId; + private Long merchantId; /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; @@ -113,10 +113,10 @@ public class WxCouponActivity implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getMerchantId() { + public Long getMerchantId() { return merchantId; } - public void setMerchantId(Integer _merchantId) { + public void setMerchantId(Long _merchantId) { merchantId = _merchantId; } public Integer getType() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java index 6a1611d30..83b6d90d3 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java @@ -46,13 +46,13 @@ public class WxCouponRecord implements Serializable { private String tenantId; /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") - private Integer couponId; + private Long couponId; /*订单id**/ @io.swagger.annotations.ApiModelProperty(value="订单id",name="orderId") - private Integer orderId; + private Long orderId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Integer cUserId; + private Long cUserId; /*购买日期/领取日期**/ @io.swagger.annotations.ApiModelProperty(value="购买日期/领取日期",name="buyDate") private Date buyDate; @@ -64,7 +64,7 @@ public class WxCouponRecord implements Serializable { private Integer cStatus; /*b端用户id**/ @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") - private Integer bUserId; + private Long bUserId; /*核销日期**/ @io.swagger.annotations.ApiModelProperty(value="核销日期",name="verificationDate") private Date verificationDate; @@ -77,22 +77,22 @@ public class WxCouponRecord implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCouponId() { + public Long getCouponId() { return couponId; } - public void setCouponId(Integer _couponId) { + public void setCouponId(Long _couponId) { couponId = _couponId; } - public Integer getOrderId() { + public Long getOrderId() { return orderId; } - public void setOrderId(Integer _orderId) { + public void setOrderId(Long _orderId) { orderId = _orderId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public Date getBuyDate() { @@ -113,10 +113,10 @@ public class WxCouponRecord implements Serializable { public void setCStatus(Integer _cStatus) { cStatus = _cStatus; } - public Integer getBUserId() { + public Long getBUserId() { return bUserId; } - public void setBUserId(Integer _bUserId) { + public void setBUserId(Long _bUserId) { bUserId = _bUserId; } public Date getVerificationDate() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java index c2e8bd392..df33280b0 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java @@ -46,7 +46,7 @@ public class WxEtcpCouponRecord implements Serializable { private String tenantId; /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") - private Integer couponId; + private Long couponId; /*车牌号**/ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") private String carNumber; @@ -77,10 +77,10 @@ public class WxEtcpCouponRecord implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCouponId() { + public Long getCouponId() { return couponId; } - public void setCouponId(Integer _couponId) { + public void setCouponId(Long _couponId) { couponId = _couponId; } public String getCarNumber() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java index 780cd3c2a..7eafc3ad7 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java @@ -46,7 +46,7 @@ public class WxFlashSale implements Serializable { private String tenantId; /*优惠券活动ID**/ @io.swagger.annotations.ApiModelProperty(value="优惠券活动ID",name="activityId") - private Integer activityId; + private Long activityId; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @@ -62,10 +62,10 @@ public class WxFlashSale implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getActivityId() { + public Long getActivityId() { return activityId; } - public void setActivityId(Integer _activityId) { + public void setActivityId(Long _activityId) { activityId = _activityId; } public Date getCreatetime() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java index 6baccf274..8306f37b6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java @@ -46,7 +46,7 @@ public class WxMallBuilding implements Serializable { private String tenantId; /*商场id**/ @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") - private Integer mallId; + private Long mallId; /*楼座名**/ @io.swagger.annotations.ApiModelProperty(value="楼座名",name="name") private String name; @@ -59,10 +59,10 @@ public class WxMallBuilding implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getMallId() { + public Long getMallId() { return mallId; } - public void setMallId(Integer _mallId) { + public void setMallId(Long _mallId) { mallId = _mallId; } public String getName() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java index 7a7ce51d2..661d76988 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java @@ -46,10 +46,10 @@ public class WxMallFloor implements Serializable { private String tenantId; /*商场id**/ @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId") - private Integer mallId; + private Long mallId; /*楼座id**/ @io.swagger.annotations.ApiModelProperty(value="楼座id",name="buildingId") - private Integer buildingId; + private Long buildingId; /*楼层名**/ @io.swagger.annotations.ApiModelProperty(value="楼层名",name="floorName") private String floorName; @@ -59,16 +59,16 @@ public class WxMallFloor implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getMallId() { + public Long getMallId() { return mallId; } - public void setMallId(Integer _mallId) { + public void setMallId(Long _mallId) { mallId = _mallId; } - public Integer getBuildingId() { + public Long getBuildingId() { return buildingId; } - public void setBuildingId(Integer _buildingId) { + public void setBuildingId(Long _buildingId) { buildingId = _buildingId; } public String getFloorName() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java index 343978bca..53b14ac5e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java @@ -46,26 +46,26 @@ public class WxMerchantShop implements Serializable { private String tenantId; /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Integer merchantId; + private Long merchantId; /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") - private Integer shopId; + private Long shopId; public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getMerchantId() { + public Long getMerchantId() { return merchantId; } - public void setMerchantId(Integer _merchantId) { + public void setMerchantId(Long _merchantId) { merchantId = _merchantId; } - public Integer getShopId() { + public Long getShopId() { return shopId; } - public void setShopId(Integer _shopId) { + public void setShopId(Long _shopId) { shopId = _shopId; } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java index 2679af203..1bafb1beb 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java @@ -46,7 +46,7 @@ public class WxMerchantTradeDays implements Serializable { private String tenantId; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") - private Integer merchantId; + private Long merchantId; /*交易额**/ @io.swagger.annotations.ApiModelProperty(value="交易额",name="tradeAmt") private BigDecimal tradeAmt; @@ -59,10 +59,10 @@ public class WxMerchantTradeDays implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getMerchantId() { + public Long getMerchantId() { return merchantId; } - public void setMerchantId(Integer _merchantId) { + public void setMerchantId(Long _merchantId) { merchantId = _merchantId; } public BigDecimal getTradeAmt() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java index 17e5e141d..133992251 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java @@ -46,7 +46,7 @@ public class WxMsg implements Serializable { private String tenantId; /*模板id**/ @io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId") - private Integer modelId; + private Long modelId; /*内容**/ @io.swagger.annotations.ApiModelProperty(value="内容",name="msg") private String msg; @@ -77,10 +77,10 @@ public class WxMsg implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getModelId() { + public Long getModelId() { return modelId; } - public void setModelId(Integer _modelId) { + public void setModelId(Long _modelId) { modelId = _modelId; } public String getMsg() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java index 25b9df38c..ab3f59015 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java @@ -55,13 +55,13 @@ public class WxMsgConfig implements Serializable { private String bid; /*充值条数**/ @io.swagger.annotations.ApiModelProperty(value="充值条数",name="recharge") - private Integer recharge; + private Long recharge; /*剩余条数**/ @io.swagger.annotations.ApiModelProperty(value="剩余条数",name="remains") - private Integer remains; + private Long remains; /*短信总数**/ @io.swagger.annotations.ApiModelProperty(value="短信总数",name="total") - private Integer total; + private Long total; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="account") private String account; @@ -70,7 +70,7 @@ public class WxMsgConfig implements Serializable { private Integer reminderstatus; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="reminder") - private Integer reminder; + private Long reminder; /***/ @io.swagger.annotations.ApiModelProperty(value="",name="phone") private String phone; @@ -98,22 +98,22 @@ public class WxMsgConfig implements Serializable { public void setBid(String _bid) { bid = _bid; } - public Integer getRecharge() { + public Long getRecharge() { return recharge; } - public void setRecharge(Integer _recharge) { + public void setRecharge(Long _recharge) { recharge = _recharge; } - public Integer getRemains() { + public Long getRemains() { return remains; } - public void setRemains(Integer _remains) { + public void setRemains(Long _remains) { remains = _remains; } - public Integer getTotal() { + public Long getTotal() { return total; } - public void setTotal(Integer _total) { + public void setTotal(Long _total) { total = _total; } public String getAccount() { @@ -128,10 +128,10 @@ public class WxMsgConfig implements Serializable { public void setReminderstatus(Integer _reminderstatus) { reminderstatus = _reminderstatus; } - public Integer getReminder() { + public Long getReminder() { return reminder; } - public void setReminder(Integer _reminder) { + public void setReminder(Long _reminder) { reminder = _reminder; } public String getPhone() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java index 3100c8817..1333fd5ca 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java @@ -46,10 +46,10 @@ public class WxOrders implements Serializable { private String tenantId; /*卡券活动id**/ @io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="couponId") - private Integer couponId; + private Long couponId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Integer cUserId; + private Long cUserId; /*支付金额**/ @io.swagger.annotations.ApiModelProperty(value="支付金额",name="payment") private BigDecimal payment; @@ -68,16 +68,16 @@ public class WxOrders implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCouponId() { + public Long getCouponId() { return couponId; } - public void setCouponId(Integer _couponId) { + public void setCouponId(Long _couponId) { couponId = _couponId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public BigDecimal getPayment() { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java index 70f877766..27a9f8c26 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java @@ -46,7 +46,7 @@ public class WxScoreHistory implements Serializable { private String tenantId; /*会员ID**/ @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") - private Integer cUserId; + private Long cUserId; /*创建日期**/ @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") private Date createDate; @@ -55,7 +55,7 @@ public class WxScoreHistory implements Serializable { private Date validDate; /*单据号**/ @io.swagger.annotations.ApiModelProperty(value="单据号",name="orderId") - private Integer orderId; + private Long orderId; /*支付方式**/ @io.swagger.annotations.ApiModelProperty(value="支付方式",name="payType") private Integer payType; @@ -71,10 +71,10 @@ public class WxScoreHistory implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Integer getCUserId() { + public Long getCUserId() { return cUserId; } - public void setCUserId(Integer _cUserId) { + public void setCUserId(Long _cUserId) { cUserId = _cUserId; } public Date getCreateDate() { @@ -89,10 +89,10 @@ public class WxScoreHistory implements Serializable { public void setValidDate(Date _validDate) { validDate = _validDate; } - public Integer getOrderId() { + public Long getOrderId() { return orderId; } - public void setOrderId(Integer _orderId) { + public void setOrderId(Long _orderId) { orderId = _orderId; } public Integer getPayType() { diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index a7ca0e9ab..39f6a6065 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml index fb1881123..8fb7026dc 100644 --- a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml index d1dcec8ae..c639169ff 100644 --- a/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml b/mallinkService/src/main/resources/mapper/WxBannersMapper.xml index d4028aeb9..db6749627 100644 --- a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBannersMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 3c88739c8..4ed29f287 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml index 6a03f7d6f..f9ac28d7a 100644 --- a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml index cc3b838ed..d4f191c73 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml index 0fdd83e5d..e65b3ebde 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml index 088832757..e48b80c03 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 18fd7b239..14819b307 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 9c5c877d2..0b829862d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 4229db599..71bec59e1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml index 6c9f30831..ce570acb9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 5601144ab..b1f0aed58 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml index 4cf0e70e0..29d71fb81 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml @@ -2,15 +2,15 @@ - + - - - + + + - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponTypeMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponTypeMapper.xml index 4379c8688..1b220387d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponTypeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml index e725504cf..9ecdc1418 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml index 4e601ed0b..5f280b065 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml index b48a536f3..8b4273a71 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml index 45219bcf8..dae25ed9f 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml index b21300e91..0a04d7496 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml index d76bf61dd..880e08452 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml index 9b6e9121c..bfe038568 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml index e101d2576..c5978349a 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml index f93e8a612..e15c9cb59 100644 --- a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index fad867c90..5b57bcf17 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 33cdf04f6..ebcd1fc14 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index cb3133330..676b94334 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 2b5f0dc79..293cef8c9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index cae5ddd97..89259f6d3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml index 08e26ffb2..bcbc0e2b4 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index e9d55fe84..62860dceb 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -2,17 +2,17 @@ - + - - - + + + - + diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml index cca8a6ca1..cccbd3b61 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 74909ca76..6a162dade 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml index 63812e7db..d17aa6528 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml index 69f3a8273..6eebdf28c 100644 --- a/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml @@ -2,10 +2,10 @@ - + - - + + diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index faa8b2384..65608ee45 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 911404a55..aef6e3de1 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -2,12 +2,12 @@ - + - + - + diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index a6046d2e6..0eb5204f1 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml index 8996ad8af..50b44f7d2 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 22fd0713b..6b1011489 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index 74c7ebf96..c557286a3 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml index 040011e72..e0af1686f 100644 --- a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml @@ -2,7 +2,7 @@ - +