diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml
index f0a2d8a70..47ddf2151 100644
--- a/mallinkService/pom.xml
+++ b/mallinkService/pom.xml
@@ -10,17 +10,4 @@
4.0.0
mallinkService
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
- 1.8
- 1.8
-
-
-
-
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/simple/common/IdWorker.java b/mallinkService/src/main/java/com/simple/common/IdWorker.java
new file mode 100644
index 000000000..7901dd5fd
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/common/IdWorker.java
@@ -0,0 +1,72 @@
+package com.simple.common;
+
+public class IdWorker {
+
+ private final long twepoch = 1288834974657L;
+ private final long workerIdBits = 5L;
+ private final long datacenterIdBits = 5L;
+ private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+ private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+ private final long sequenceBits = 12L;
+ private final long workerIdShift = sequenceBits;
+ private final long datacenterIdShift = sequenceBits + workerIdBits;
+ private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+ private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+ private long workerId;
+ private long datacenterId;
+ private long sequence = 0L;
+ private long lastTimestamp = -1L;
+
+ public IdWorker(long workerId, long datacenterId) {
+ if (workerId > maxWorkerId || workerId < 0) {
+ throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+ }
+ if (datacenterId > maxDatacenterId || datacenterId < 0) {
+ throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+ }
+ this.workerId = workerId;
+ this.datacenterId = datacenterId;
+ }
+
+ public synchronized long nextId() {
+ long timestamp = timeGen();
+ if (timestamp < lastTimestamp) {
+ throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+ }
+ if (lastTimestamp == timestamp) {
+ sequence = (sequence + 1) & sequenceMask;
+ if (sequence == 0) {
+ timestamp = tilNextMillis(lastTimestamp);
+ }
+ } else {
+ sequence = 0L;
+ }
+
+ lastTimestamp = timestamp;
+
+ return ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift) | (workerId << workerIdShift) | sequence;
+ }
+
+ protected long tilNextMillis(long lastTimestamp) {
+ long timestamp = timeGen();
+ while (timestamp <= lastTimestamp) {
+ timestamp = timeGen();
+ }
+ return timestamp;
+ }
+
+ protected long timeGen() {
+ return System.currentTimeMillis();
+ }
+
+ public static void main(String[] args) {
+ IdWorker idWorker = new IdWorker(0, 0);
+ for (int i = 0; i < 1000; i++) {
+ long id = idWorker.nextId();
+ System.out.println(id);
+ }
+ System.out.println((1025937392038576128l+"").length());
+ }
+
+ }
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java
index c9f257413..4f906b6d4 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java
@@ -13,19 +13,21 @@ public class WxAppinfo implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxAppinfo implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*小程序ID**/
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appid")
private String appid;
@@ -63,6 +68,12 @@ public class WxAppinfo implements Serializable {
/*微信token有效时间单位(秒)**/
@io.swagger.annotations.ApiModelProperty(value="微信token有效时间单位(秒)",name="expiresIn")
private Integer expiresIn;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getAppid() {
return appid;
}
@@ -117,6 +128,7 @@ public class WxAppinfo implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Appid_ASC("`appid` ASC"),Appid_DESC("`appid` DESC")
,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java
index 3bf03b40c..e50d0e865 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxBLog.java
@@ -13,19 +13,21 @@ public class WxBLog implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxBLog implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="data")
private String data;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getData() {
return data;
}
@@ -63,6 +74,7 @@ public class WxBLog implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Data_ASC("`data` ASC"),Data_DESC("`data` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
;
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 da04044ab..74eacb57e 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxBUserMerchant.java
@@ -1,6 +1,8 @@
package com.simple.domain.po;
import javax.persistence.*;
+import java.util.*;
+import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
@@ -11,19 +13,21 @@ public class WxBUserMerchant implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -37,12 +41,21 @@ public class WxBUserMerchant implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*B端用户id**/
@io.swagger.annotations.ApiModelProperty(value="B端用户id",name="bUserId")
private Integer bUserId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Integer merchantId;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getBUserId() {
return bUserId;
}
@@ -61,6 +74,7 @@ public class WxBUserMerchant implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java
index 5bd2e6e00..8a786bba4 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java
@@ -13,19 +13,21 @@ public class WxBanners implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxBanners implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*封面图**/
@io.swagger.annotations.ApiModelProperty(value="封面图",name="facePicUrl")
private String facePicUrl;
@@ -63,6 +68,12 @@ public class WxBanners implements Serializable {
/*状态 1启用 2停用**/
@io.swagger.annotations.ApiModelProperty(value="状态 1启用 2停用",name="isEnable")
private Integer isEnable;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getFacePicUrl() {
return facePicUrl;
}
@@ -117,6 +128,7 @@ public class WxBanners implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,FacePicUrl_ASC("`facePicUrl` ASC"),FacePicUrl_DESC("`facePicUrl` DESC")
,ActivityType_ASC("`activityType` ASC"),ActivityType_DESC("`activityType` DESC")
,Url_ASC("`url` ASC"),Url_DESC("`url` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java
index abf00ecc8..2b58ef88d 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java
@@ -13,19 +13,21 @@ public class WxBusiness implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,9 +41,18 @@ public class WxBusiness implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*业态名**/
@io.swagger.annotations.ApiModelProperty(value="业态名",name="title")
private String title;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getTitle() {
return title;
}
@@ -54,6 +65,7 @@ public class WxBusiness implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
;
private String value;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java
index c6b4f10b8..3d4cc11ae 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCLog.java
@@ -13,19 +13,21 @@ public class WxCLog implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxCLog implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="data")
private String data;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getData() {
return data;
}
@@ -63,6 +74,7 @@ public class WxCLog implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Data_ASC("`data` ASC"),Data_DESC("`data` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java
index 71d990318..d43ae3437 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java
@@ -13,19 +13,21 @@ public class WxCUser implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxCUser implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*微信openId**/
@io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId")
private String openId;
@@ -96,6 +101,12 @@ public class WxCUser implements Serializable {
/*积分**/
@io.swagger.annotations.ApiModelProperty(value="积分",name="score")
private Integer score;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getOpenId() {
return openId;
}
@@ -216,6 +227,7 @@ public class WxCUser implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,OpenId_ASC("`openId` ASC"),OpenId_DESC("`openId` DESC")
,UnionId_ASC("`unionId` ASC"),UnionId_DESC("`unionId` DESC")
,NickName_ASC("`nickName` ASC"),NickName_DESC("`nickName` DESC")
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 ce122e654..71d05bd7a 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java
@@ -13,19 +13,21 @@ public class WxCUserCars implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxCUserCars implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*c端用户id**/
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId")
private Integer cUserId;
/*车牌号**/
@io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber")
private String carNumber;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCUserId() {
return cUserId;
}
@@ -63,6 +74,7 @@ public class WxCUserCars implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC")
;
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 e3c4e700d..70659ccd2 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCloud.java
@@ -13,19 +13,21 @@ public class WxCUserCloud implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,17 +41,20 @@ public class WxCUserCloud implements Serializable {
- /*大数据相关信息**/
- @io.swagger.annotations.ApiModelProperty(value="大数据相关信息",name="cloudData")
- private String cloudData;
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*c端用户id**/
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId")
private Integer cUserId;
- public String getCloudData() {
- return cloudData;
+ /*大数据相关信息**/
+ @io.swagger.annotations.ApiModelProperty(value="大数据相关信息",name="cloudData")
+ private String cloudData;
+ public String getTenantId() {
+ return tenantId;
}
- public void setCloudData(String _cloudData) {
- cloudData = _cloudData;
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
}
public Integer getCUserId() {
return cUserId;
@@ -57,14 +62,21 @@ public class WxCUserCloud implements Serializable {
public void setCUserId(Integer _cUserId) {
cUserId = _cUserId;
}
+ public String getCloudData() {
+ return cloudData;
+ }
+ public void setCloudData(String _cloudData) {
+ cloudData = _cloudData;
+ }
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
- ,CloudData_ASC("`cloudData` ASC"),CloudData_DESC("`cloudData` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
+ ,CloudData_ASC("`cloudData` ASC"),CloudData_DESC("`cloudData` DESC")
;
private String value;
Field(String value){
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 7a437f997..d38fb4114 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserEtcpToken.java
@@ -13,19 +13,21 @@ public class WxCUserEtcpToken implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,8 +41,11 @@ public class WxCUserEtcpToken implements Serializable {
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="cUserId")
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
+ /*c端用户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="c端用户ID",name="cUserId")
private Integer cUserId;
/*etcp token**/
@io.swagger.annotations.ApiModelProperty(value="etcp token",name="etcpToken")
@@ -51,6 +56,12 @@ public class WxCUserEtcpToken implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="etcpUpdateTime")
private Date etcpUpdateTime;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCUserId() {
return cUserId;
}
@@ -81,6 +92,7 @@ public class WxCUserEtcpToken implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
,EtcpToken_ASC("`etcpToken` ASC"),EtcpToken_DESC("`etcpToken` DESC")
,EtcpCreateTime_ASC("`etcpCreateTime` ASC"),EtcpCreateTime_DESC("`etcpCreateTime` DESC")
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 8ab8dfc1f..5095b836c 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java
@@ -13,19 +13,21 @@ public class WxCUserTags implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxCUserTags implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*c端用户id**/
@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId")
private Integer userId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="tags")
private String tags;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getUserId() {
return userId;
}
@@ -63,6 +74,7 @@ public class WxCUserTags implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC")
,Tags_ASC("`tags` ASC"),Tags_DESC("`tags` DESC")
;
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 a7dfde164..7eb1b6bb7 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java
@@ -1,31 +1,33 @@
package com.simple.domain.po;
import javax.persistence.*;
+import java.util.*;
+import java.math.*;
import javax.persistence.Transient;
import java.util.List;
import javax.persistence.Id;
import java.io.Serializable;
-import java.util.*;
-import java.math.*;
@Table(name = "wx_coupon")
public class WxCoupon implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,15 +41,18 @@ public class WxCoupon implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*卡券活动id**/
@io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="activityId")
private Integer activityId;
- /*券类型**/
- @io.swagger.annotations.ApiModelProperty(value="券类型",name="type")
- private Integer type;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Integer merchantId;
+ /*券类型**/
+ @io.swagger.annotations.ApiModelProperty(value="券类型",name="type")
+ private Integer type;
/*封面图**/
@io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg")
private String coverImg;
@@ -81,24 +86,30 @@ public class WxCoupon implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getActivityId() {
return activityId;
}
public void setActivityId(Integer _activityId) {
activityId = _activityId;
}
- public Integer getType() {
- return type;
- }
- public void setType(Integer _type) {
- type = _type;
- }
public Integer getMerchantId() {
return merchantId;
}
public void setMerchantId(Integer _merchantId) {
merchantId = _merchantId;
}
+ public Integer getType() {
+ return type;
+ }
+ public void setType(Integer _type) {
+ type = _type;
+ }
public String getCoverImg() {
return coverImg;
}
@@ -171,9 +182,10 @@ public class WxCoupon implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,ActivityId_ASC("`activityId` ASC"),ActivityId_DESC("`activityId` DESC")
- ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
+ ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC")
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 97c039764..7318371a9 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActionLog.java
@@ -13,19 +13,21 @@ public class WxCouponActionLog implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,38 +41,38 @@ public class WxCouponActionLog implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*coupon id**/
@io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId")
private Integer couponId;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="cUserId")
- private Integer cUserId;
- /*b端用户id**/
- @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId")
- private Integer bUserId;
+ /*用户id**/
+ @io.swagger.annotations.ApiModelProperty(value="用户id",name="userId")
+ private Integer userId;
/*优惠券操作(领取、支付,使用,核销等)**/
@io.swagger.annotations.ApiModelProperty(value="优惠券操作(领取、支付,使用,核销等)",name="action")
private String action;
/*操作时间**/
@io.swagger.annotations.ApiModelProperty(value="操作时间",name="operationTime")
private Date operationTime;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCouponId() {
return couponId;
}
public void setCouponId(Integer _couponId) {
couponId = _couponId;
}
- public Integer getCUserId() {
- return cUserId;
- }
- public void setCUserId(Integer _cUserId) {
- cUserId = _cUserId;
- }
- public Integer getBUserId() {
- return bUserId;
+ public Integer getUserId() {
+ return userId;
}
- public void setBUserId(Integer _bUserId) {
- bUserId = _bUserId;
+ public void setUserId(Integer _userId) {
+ userId = _userId;
}
public String getAction() {
return action;
@@ -90,9 +92,9 @@ public class WxCouponActionLog implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC")
- ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
- ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC")
+ ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC")
,Action_ASC("`action` ASC"),Action_DESC("`action` DESC")
,OperationTime_ASC("`operationTime` ASC"),OperationTime_DESC("`operationTime` DESC")
;
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 511f755a8..eb72acbe0 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponActivity.java
@@ -13,19 +13,21 @@ public class WxCouponActivity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,15 @@ public class WxCouponActivity implements Serializable {
- /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
- @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
- private Integer type;
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Integer merchantId;
+ /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
+ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
+ private Integer type;
/*封面图**/
@io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg")
private String coverImg;
@@ -102,11 +107,11 @@ public class WxCouponActivity implements Serializable {
/*状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)**/
@io.swagger.annotations.ApiModelProperty(value="状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)",name="status")
private Integer status;
- public Integer getType() {
- return type;
+ public String getTenantId() {
+ return tenantId;
}
- public void setType(Integer _type) {
- type = _type;
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
}
public Integer getMerchantId() {
return merchantId;
@@ -114,6 +119,12 @@ public class WxCouponActivity implements Serializable {
public void setMerchantId(Integer _merchantId) {
merchantId = _merchantId;
}
+ public Integer getType() {
+ return type;
+ }
+ public void setType(Integer _type) {
+ type = _type;
+ }
public String getCoverImg() {
return coverImg;
}
@@ -234,8 +245,9 @@ public class WxCouponActivity implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
- ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
+ ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC")
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 ae47893f4..6a1611d30 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponRecord.java
@@ -13,19 +13,21 @@ public class WxCouponRecord implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxCouponRecord implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*coupon id**/
@io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId")
private Integer couponId;
@@ -66,6 +71,12 @@ public class WxCouponRecord implements Serializable {
/*核销状态(0:未核销,1:已核销)**/
@io.swagger.annotations.ApiModelProperty(value="核销状态(0:未核销,1:已核销)",name="verificationStatus")
private Integer verificationStatus;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCouponId() {
return couponId;
}
@@ -126,6 +137,7 @@ public class WxCouponRecord implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC")
,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java
index 155d84ee5..da4f1692e 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponType.java
@@ -13,19 +13,21 @@ public class WxCouponType implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
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 b99915db1..c2e8bd392 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java
@@ -13,19 +13,21 @@ public class WxEtcpCouponRecord implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxEtcpCouponRecord implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*coupon id**/
@io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId")
private Integer couponId;
@@ -66,6 +71,12 @@ public class WxEtcpCouponRecord implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCouponId() {
return couponId;
}
@@ -126,6 +137,7 @@ public class WxEtcpCouponRecord implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC")
,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC")
,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java
index 6fea86fc5..2978421cb 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java
@@ -13,19 +13,21 @@ public class WxEtcpParkDissolution implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,9 +41,18 @@ public class WxEtcpParkDissolution implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/* 签约号**/
@io.swagger.annotations.ApiModelProperty(value=" 签约号",name="signNo")
private String signNo;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getSignNo() {
return signNo;
}
@@ -54,6 +65,7 @@ public class WxEtcpParkDissolution implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,SignNo_ASC("`signNo` ASC"),SignNo_DESC("`signNo` DESC")
;
private String value;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java
index 8ea36f786..28d531318 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java
@@ -13,19 +13,21 @@ public class WxEtcpParkIn implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxEtcpParkIn implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="synId")
private String synId;
@@ -48,6 +53,12 @@ public class WxEtcpParkIn implements Serializable {
/*车场名称**/
@io.swagger.annotations.ApiModelProperty(value="车场名称",name="parkName")
private String parkName;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getSynId() {
return synId;
}
@@ -72,6 +83,7 @@ public class WxEtcpParkIn implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC")
,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC")
,ParkName_ASC("`parkName` ASC"),ParkName_DESC("`parkName` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java
index e5d7c7ecd..2f837bc9b 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java
@@ -13,19 +13,21 @@ public class WxEtcpParkMsgSuc implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,9 +41,18 @@ public class WxEtcpParkMsgSuc implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*签约号**/
@io.swagger.annotations.ApiModelProperty(value="签约号",name="signNo")
private String signNo;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getSignNo() {
return signNo;
}
@@ -54,6 +65,7 @@ public class WxEtcpParkMsgSuc implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,SignNo_ASC("`signNo` ASC"),SignNo_DESC("`signNo` DESC")
;
private String value;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java
index c4fdb99f4..355a523c4 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java
@@ -13,19 +13,21 @@ public class WxEtcpParkOrderunpay implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxEtcpParkOrderunpay implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*车牌号**/
@io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber")
private String plateNumber;
@@ -93,6 +98,12 @@ public class WxEtcpParkOrderunpay implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getPlateNumber() {
return plateNumber;
}
@@ -207,6 +218,7 @@ public class WxEtcpParkOrderunpay implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC")
,Code_ASC("`code` ASC"),Code_DESC("`code` DESC")
,Message_ASC("`message` ASC"),Message_DESC("`message` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java
index d483efc58..b48fc4751 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java
@@ -13,19 +13,21 @@ public class WxEtcpParkOut implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,15 +41,24 @@ public class WxEtcpParkOut implements Serializable {
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="synId")
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
+ /*ETCP订单ID**/
+ @io.swagger.annotations.ApiModelProperty(value="ETCP订单ID",name="synId")
private String synId;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="plateNumber")
+ /*车牌号**/
+ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber")
private String plateNumber;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="parkName")
+ /*车场名**/
+ @io.swagger.annotations.ApiModelProperty(value="车场名",name="parkName")
private String parkName;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getSynId() {
return synId;
}
@@ -72,6 +83,7 @@ public class WxEtcpParkOut implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC")
,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC")
,ParkName_ASC("`parkName` ASC"),ParkName_DESC("`parkName` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java
index 801098827..c0ffea8d1 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java
@@ -13,19 +13,21 @@ public class WxEtcpParkTransaction implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxEtcpParkTransaction implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)**/
@io.swagger.annotations.ApiModelProperty(value="支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)",name="payType")
private Integer payType;
@@ -48,14 +53,14 @@ public class WxEtcpParkTransaction implements Serializable {
/*支付完成后跳转地址 ,支付方 式为 1,2,5 时候需要**/
@io.swagger.annotations.ApiModelProperty(value="支付完成后跳转地址 ,支付方 式为 1,2,5 时候需要",name="returnUrl")
private String returnUrl;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="couponCode")
+ /*优惠券code**/
+ @io.swagger.annotations.ApiModelProperty(value="优惠券code",name="couponCode")
private String couponCode;
- /*停车费查询code**/
- @io.swagger.annotations.ApiModelProperty(value="停车费查询code",name="code")
+ /*停车费查询结果code**/
+ @io.swagger.annotations.ApiModelProperty(value="停车费查询结果code",name="code")
private Integer code;
- /*停车费查询message**/
- @io.swagger.annotations.ApiModelProperty(value="停车费查询message",name="message")
+ /*停车费查询结果message**/
+ @io.swagger.annotations.ApiModelProperty(value="停车费查询结果message",name="message")
private String message;
/*停车费查询data**/
@io.swagger.annotations.ApiModelProperty(value="停车费查询data",name="data")
@@ -69,6 +74,12 @@ public class WxEtcpParkTransaction implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getPayType() {
return payType;
}
@@ -135,6 +146,7 @@ public class WxEtcpParkTransaction implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,PayType_ASC("`payType` ASC"),PayType_DESC("`payType` DESC")
,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC")
,ReturnUrl_ASC("`returnUrl` ASC"),ReturnUrl_DESC("`returnUrl` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java
index 3abbd7067..2ff699df5 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java
@@ -13,19 +13,21 @@ public class WxEtcpParkUnbind implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,9 +41,18 @@ public class WxEtcpParkUnbind implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*车牌号**/
@io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber")
private String plateNumber;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getPlateNumber() {
return plateNumber;
}
@@ -54,6 +65,7 @@ public class WxEtcpParkUnbind implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC")
;
private String value;
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 b32554797..780cd3c2a 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java
@@ -13,19 +13,21 @@ public class WxFlashSale implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,8 +41,11 @@ public class WxFlashSale implements Serializable {
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="activityId")
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
+ /*优惠券活动ID**/
+ @io.swagger.annotations.ApiModelProperty(value="优惠券活动ID",name="activityId")
private Integer activityId;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
@@ -51,6 +56,12 @@ public class WxFlashSale implements Serializable {
/*状态 1启用 2停用**/
@io.swagger.annotations.ApiModelProperty(value="状态 1启用 2停用",name="isEnable")
private Integer isEnable;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getActivityId() {
return activityId;
}
@@ -81,6 +92,7 @@ public class WxFlashSale implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,ActivityId_ASC("`activityId` ASC"),ActivityId_DESC("`activityId` DESC")
,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
,Uptime_ASC("`uptime` ASC"),Uptime_DESC("`uptime` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxImgUrl.java b/mallinkService/src/main/java/com/simple/domain/po/WxImgUrl.java
new file mode 100644
index 000000000..e07d80610
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxImgUrl.java
@@ -0,0 +1,121 @@
+package com.simple.domain.po;
+
+import javax.persistence.*;
+import java.util.*;
+import java.math.*;
+import javax.persistence.Transient;
+import java.util.List;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+@Table(name = "wx_img_url")
+public class WxImgUrl implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ protected Long id;
+
+ @Transient
+ protected List ids;
+ @Transient
+ protected String sortColumns;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getSortColumns() {
+ return sortColumns;
+ }
+
+ public List getIds() {
+ return ids;
+ }
+ public void setIds(List ids) {
+ this.ids = ids;
+ }
+
+
+
+ /*华冠轮播图图片地址**/
+ @io.swagger.annotations.ApiModelProperty(value="华冠轮播图图片地址",name="address")
+ private String address;
+ /*跳转路径标志**/
+ @io.swagger.annotations.ApiModelProperty(value="跳转路径标志",name="sign")
+ private String sign;
+ public String getAddress() {
+ return address;
+ }
+ public void setAddress(String _address) {
+ address = _address;
+ }
+ public String getSign() {
+ return sign;
+ }
+ public void setSign(String _sign) {
+ sign = _sign;
+ }
+
+
+
+ public static enum Field
+ {
+ Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,Address_ASC("`address` ASC"),Address_DESC("`address` DESC")
+ ,Sign_ASC("`sign` ASC"),Sign_DESC("`sign` DESC")
+ ;
+ private String value;
+ Field(String value){
+ this.value = value;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setCol(String value) {
+ this.value = value;
+ }
+ @Override
+ public String toString() {
+ return this.getValue();
+ }
+ }
+
+ public void setSortColumns(WxImgUrl.Field... fields)
+ {
+ if (fields == null || fields.length == 0) {
+ return;
+ }
+ for (int k = 0; k < fields.length; k++) {
+ if (fields[k] == null) {
+ return;
+ }
+ }
+ StringBuilder sb = new StringBuilder(fields[0].toString());
+ for (int k = 1; k < fields.length; k++) {
+ sb.append(",");
+ sb.append(fields[k].toString());
+ }
+
+ }
+
+ public void setSortColumns(String sortColumns)
+ {
+ if (sortColumns == null || "".equals(sortColumns.trim())) {
+ return;
+ }
+ if (sortColumns.contains(",")) {
+ String[] cols = sortColumns.split(",");
+ java.util.List fList = new java.util.ArrayList();
+ for (int k = 0; k < cols.length; k++) {
+ fList.add(Field.valueOf(cols[k]));
+ }
+ this.setSortColumns(fList.toArray(new Field[fList.size()]));
+ } else {
+ this.setSortColumns(Field.valueOf(sortColumns));
+ }
+ }
+}
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java
index f6ca87cd1..f52a97472 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMall.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMall.java
@@ -13,19 +13,21 @@ public class WxMall implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,11 +41,14 @@ public class WxMall implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商场名**/
@io.swagger.annotations.ApiModelProperty(value="商场名",name="name")
private String name;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="group")
+ /*集团**/
+ @io.swagger.annotations.ApiModelProperty(value="集团",name="group")
private String group;
/*国家**/
@io.swagger.annotations.ApiModelProperty(value="国家",name="country")
@@ -60,9 +65,6 @@ public class WxMall implements Serializable {
/*迈外迪id**/
@io.swagger.annotations.ApiModelProperty(value="迈外迪id",name="wiwideId")
private String wiwideId;
- /*etcp 车场id**/
- @io.swagger.annotations.ApiModelProperty(value="etcp 车场id",name="etcpId")
- private String etcpId;
/*总面积**/
@io.swagger.annotations.ApiModelProperty(value="总面积",name="totalArea")
private BigDecimal totalArea;
@@ -75,6 +77,12 @@ public class WxMall implements Serializable {
/*车位数**/
@io.swagger.annotations.ApiModelProperty(value="车位数",name="parkPlaceNumber")
private Integer parkPlaceNumber;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getName() {
return name;
}
@@ -117,12 +125,6 @@ public class WxMall implements Serializable {
public void setWiwideId(String _wiwideId) {
wiwideId = _wiwideId;
}
- public String getEtcpId() {
- return etcpId;
- }
- public void setEtcpId(String _etcpId) {
- etcpId = _etcpId;
- }
public BigDecimal getTotalArea() {
return totalArea;
}
@@ -153,6 +155,7 @@ public class WxMall implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
,Group_ASC("`group` ASC"),Group_DESC("`group` DESC")
,Country_ASC("`country` ASC"),Country_DESC("`country` DESC")
@@ -160,7 +163,6 @@ public class WxMall implements Serializable {
,City_ASC("`city` ASC"),City_DESC("`city` DESC")
,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC")
,WiwideId_ASC("`wiwideId` ASC"),WiwideId_DESC("`wiwideId` DESC")
- ,EtcpId_ASC("`etcpId` ASC"),EtcpId_DESC("`etcpId` DESC")
,TotalArea_ASC("`totalArea` ASC"),TotalArea_DESC("`totalArea` DESC")
,OperatingArea_ASC("`operatingArea` ASC"),OperatingArea_DESC("`operatingArea` DESC")
,ParkArea_ASC("`parkArea` ASC"),ParkArea_DESC("`parkArea` DESC")
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 544d28ac7..6baccf274 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java
@@ -13,19 +13,21 @@ public class WxMallBuilding implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,8 +41,11 @@ public class WxMallBuilding implements Serializable {
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="mallId")
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
+ /*商场id**/
+ @io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId")
private Integer mallId;
/*楼座名**/
@io.swagger.annotations.ApiModelProperty(value="楼座名",name="name")
@@ -48,6 +53,12 @@ public class WxMallBuilding implements Serializable {
/*楼层数**/
@io.swagger.annotations.ApiModelProperty(value="楼层数",name="floorNumber")
private Integer floorNumber;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getMallId() {
return mallId;
}
@@ -72,6 +83,7 @@ public class WxMallBuilding implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MallId_ASC("`mallId` ASC"),MallId_DESC("`mallId` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
,FloorNumber_ASC("`floorNumber` ASC"),FloorNumber_DESC("`floorNumber` DESC")
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 377c9e84d..7a7ce51d2 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java
@@ -13,19 +13,21 @@ public class WxMallFloor implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,15 +41,24 @@ public class WxMallFloor implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商场id**/
@io.swagger.annotations.ApiModelProperty(value="商场id",name="mallId")
private Integer mallId;
/*楼座id**/
@io.swagger.annotations.ApiModelProperty(value="楼座id",name="buildingId")
private Integer buildingId;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="floorName")
+ /*楼层名**/
+ @io.swagger.annotations.ApiModelProperty(value="楼层名",name="floorName")
private String floorName;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getMallId() {
return mallId;
}
@@ -72,6 +83,7 @@ public class WxMallFloor implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MallId_ASC("`mallId` ASC"),MallId_DESC("`mallId` DESC")
,BuildingId_ASC("`buildingId` ASC"),BuildingId_DESC("`buildingId` DESC")
,FloorName_ASC("`floorName` ASC"),FloorName_DESC("`floorName` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
index 4a74fb646..119de75b6 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
@@ -13,19 +13,21 @@ public class WxMerchant implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxMerchant implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商户图片**/
@io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl")
private String imgUrl;
@@ -57,9 +62,12 @@ public class WxMerchant implements Serializable {
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private String merchantId;
- /*etcp 商户号**/
- @io.swagger.annotations.ApiModelProperty(value="etcp 商户号",name="etcpMerchantId")
- private String etcpMerchantId;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getImgUrl() {
return imgUrl;
}
@@ -96,25 +104,19 @@ public class WxMerchant implements Serializable {
public void setMerchantId(String _merchantId) {
merchantId = _merchantId;
}
- public String getEtcpMerchantId() {
- return etcpMerchantId;
- }
- public void setEtcpMerchantId(String _etcpMerchantId) {
- etcpMerchantId = _etcpMerchantId;
- }
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,ImgUrl_ASC("`imgUrl` ASC"),ImgUrl_DESC("`imgUrl` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
,LinkPhone_ASC("`linkPhone` ASC"),LinkPhone_DESC("`linkPhone` DESC")
,BankCard_ASC("`bankCard` ASC"),BankCard_DESC("`bankCard` DESC")
,BankName_ASC("`bankName` ASC"),BankName_DESC("`bankName` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
- ,EtcpMerchantId_ASC("`etcpMerchantId` ASC"),EtcpMerchantId_DESC("`etcpMerchantId` DESC")
;
private String value;
Field(String value){
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantEtcp.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantEtcp.java
new file mode 100644
index 000000000..7ab06578c
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantEtcp.java
@@ -0,0 +1,121 @@
+package com.simple.domain.po;
+
+import javax.persistence.*;
+import java.util.*;
+import java.math.*;
+import javax.persistence.Transient;
+import java.util.List;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+@Table(name = "wx_merchant_etcp")
+public class WxMerchantEtcp implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ protected Long id;
+
+ @Transient
+ protected List ids;
+ @Transient
+ protected String sortColumns;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getSortColumns() {
+ return sortColumns;
+ }
+
+ public List getIds() {
+ return ids;
+ }
+ public void setIds(List ids) {
+ this.ids = ids;
+ }
+
+
+
+ /*商户号**/
+ @io.swagger.annotations.ApiModelProperty(value="商户号",name="merchantId")
+ private Integer merchantId;
+ /*etcp 商户号**/
+ @io.swagger.annotations.ApiModelProperty(value="etcp 商户号",name="etcpMerchantId")
+ private String etcpMerchantId;
+ public Integer getMerchantId() {
+ return merchantId;
+ }
+ public void setMerchantId(Integer _merchantId) {
+ merchantId = _merchantId;
+ }
+ public String getEtcpMerchantId() {
+ return etcpMerchantId;
+ }
+ public void setEtcpMerchantId(String _etcpMerchantId) {
+ etcpMerchantId = _etcpMerchantId;
+ }
+
+
+
+ public static enum Field
+ {
+ Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
+ ,EtcpMerchantId_ASC("`etcpMerchantId` ASC"),EtcpMerchantId_DESC("`etcpMerchantId` DESC")
+ ;
+ private String value;
+ Field(String value){
+ this.value = value;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setCol(String value) {
+ this.value = value;
+ }
+ @Override
+ public String toString() {
+ return this.getValue();
+ }
+ }
+
+ public void setSortColumns(WxMerchantEtcp.Field... fields)
+ {
+ if (fields == null || fields.length == 0) {
+ return;
+ }
+ for (int k = 0; k < fields.length; k++) {
+ if (fields[k] == null) {
+ return;
+ }
+ }
+ StringBuilder sb = new StringBuilder(fields[0].toString());
+ for (int k = 1; k < fields.length; k++) {
+ sb.append(",");
+ sb.append(fields[k].toString());
+ }
+
+ }
+
+ public void setSortColumns(String sortColumns)
+ {
+ if (sortColumns == null || "".equals(sortColumns.trim())) {
+ return;
+ }
+ if (sortColumns.contains(",")) {
+ String[] cols = sortColumns.split(",");
+ java.util.List fList = new java.util.ArrayList();
+ for (int k = 0; k < cols.length; k++) {
+ fList.add(Field.valueOf(cols[k]));
+ }
+ this.setSortColumns(fList.toArray(new Field[fList.size()]));
+ } else {
+ this.setSortColumns(Field.valueOf(sortColumns));
+ }
+ }
+}
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 520dcd4ae..343978bca 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java
@@ -13,19 +13,21 @@ public class WxMerchantShop implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxMerchantShop implements Serializable {
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="merchantId")
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
+ /*商户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Integer merchantId;
- /***/
- @io.swagger.annotations.ApiModelProperty(value="",name="shopId")
+ /*商铺ID**/
+ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
private Integer shopId;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getMerchantId() {
return merchantId;
}
@@ -63,6 +74,7 @@ public class WxMerchantShop implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC")
;
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 0445e202f..2679af203 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDays.java
@@ -13,19 +13,21 @@ public class WxMerchantTradeDays implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxMerchantTradeDays implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Integer merchantId;
@@ -48,6 +53,12 @@ public class WxMerchantTradeDays implements Serializable {
/*解单日期**/
@io.swagger.annotations.ApiModelProperty(value="解单日期",name="createDate")
private Date createDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getMerchantId() {
return merchantId;
}
@@ -72,6 +83,7 @@ public class WxMerchantTradeDays implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
,TradeAmt_ASC("`tradeAmt` ASC"),TradeAmt_DESC("`tradeAmt` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
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 967d0b879..17e5e141d 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java
@@ -13,19 +13,21 @@ public class WxMsg implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxMsg implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*模板id**/
@io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId")
private Integer modelId;
@@ -66,6 +71,12 @@ public class WxMsg implements Serializable {
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="phones")
private String phones;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getModelId() {
return modelId;
}
@@ -126,6 +137,7 @@ public class WxMsg implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC")
,Msg_ASC("`msg` ASC"),Msg_DESC("`msg` DESC")
,Sendtime_ASC("`sendtime` ASC"),Sendtime_DESC("`sendtime` DESC")
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 b83230cda..25b9df38c 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java
@@ -13,19 +13,21 @@ public class WxMsgConfig implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxMsgConfig implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="secret")
private String secret;
@@ -69,6 +74,12 @@ public class WxMsgConfig implements Serializable {
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="phone")
private String phone;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getSecret() {
return secret;
}
@@ -135,6 +146,7 @@ public class WxMsgConfig implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC")
,Publickey_ASC("`publickey` ASC"),Publickey_DESC("`publickey` DESC")
,Bid_ASC("`bid` ASC"),Bid_DESC("`bid` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java
index 78a2dcd42..90e0d501b 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgModel.java
@@ -13,19 +13,21 @@ public class WxMsgModel implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxMsgModel implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*名称**/
@io.swagger.annotations.ApiModelProperty(value="名称",name="name")
private String name;
@@ -54,6 +59,12 @@ public class WxMsgModel implements Serializable {
/*审核状态 0未通过 1 通过 2审核中**/
@io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status")
private Integer status;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getName() {
return name;
}
@@ -90,6 +101,7 @@ public class WxMsgModel implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC")
,Content_ASC("`content` ASC"),Content_DESC("`content` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java
index e2053c6bf..5acaeba2d 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgSignature.java
@@ -13,19 +13,21 @@ public class WxMsgSignature implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxMsgSignature implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*签名**/
@io.swagger.annotations.ApiModelProperty(value="签名",name="name")
private String name;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getName() {
return name;
}
@@ -63,6 +74,7 @@ public class WxMsgSignature implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
;
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 bbc624f24..3100c8817 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java
@@ -13,19 +13,21 @@ public class WxOrders implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxOrders implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*卡券活动id**/
@io.swagger.annotations.ApiModelProperty(value="卡券活动id",name="couponId")
private Integer couponId;
@@ -57,6 +62,12 @@ public class WxOrders implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCouponId() {
return couponId;
}
@@ -99,6 +110,7 @@ public class WxOrders implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java
index 52058a84f..87b3e2ca5 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java
@@ -13,19 +13,21 @@ public class WxPark implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxPark implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*停车场地址**/
@io.swagger.annotations.ApiModelProperty(value="停车场地址",name="addr")
private String addr;
@@ -51,6 +56,12 @@ public class WxPark implements Serializable {
/*出入口数量**/
@io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit")
private Integer entryExit;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getAddr() {
return addr;
}
@@ -81,6 +92,7 @@ public class WxPark implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC")
,Number_ASC("`number` ASC"),Number_DESC("`number` DESC")
,EtcpParkId_ASC("`etcpParkId` ASC"),EtcpParkId_DESC("`etcpParkId` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxParkEtcp.java b/mallinkService/src/main/java/com/simple/domain/po/WxParkEtcp.java
new file mode 100644
index 000000000..5cc893b2f
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxParkEtcp.java
@@ -0,0 +1,121 @@
+package com.simple.domain.po;
+
+import javax.persistence.*;
+import java.util.*;
+import java.math.*;
+import javax.persistence.Transient;
+import java.util.List;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+@Table(name = "wx_park_etcp")
+public class WxParkEtcp implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ protected Long id;
+
+ @Transient
+ protected List ids;
+ @Transient
+ protected String sortColumns;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getSortColumns() {
+ return sortColumns;
+ }
+
+ public List getIds() {
+ return ids;
+ }
+ public void setIds(List ids) {
+ this.ids = ids;
+ }
+
+
+
+ /*停车场id**/
+ @io.swagger.annotations.ApiModelProperty(value="停车场id",name="parkId")
+ private Integer parkId;
+ /*etcp停车场id**/
+ @io.swagger.annotations.ApiModelProperty(value="etcp停车场id",name="etcpParkId")
+ private String etcpParkId;
+ public Integer getParkId() {
+ return parkId;
+ }
+ public void setParkId(Integer _parkId) {
+ parkId = _parkId;
+ }
+ public String getEtcpParkId() {
+ return etcpParkId;
+ }
+ public void setEtcpParkId(String _etcpParkId) {
+ etcpParkId = _etcpParkId;
+ }
+
+
+
+ public static enum Field
+ {
+ Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC")
+ ,EtcpParkId_ASC("`etcpParkId` ASC"),EtcpParkId_DESC("`etcpParkId` DESC")
+ ;
+ private String value;
+ Field(String value){
+ this.value = value;
+ }
+ public String getValue() {
+ return value;
+ }
+ public void setCol(String value) {
+ this.value = value;
+ }
+ @Override
+ public String toString() {
+ return this.getValue();
+ }
+ }
+
+ public void setSortColumns(WxParkEtcp.Field... fields)
+ {
+ if (fields == null || fields.length == 0) {
+ return;
+ }
+ for (int k = 0; k < fields.length; k++) {
+ if (fields[k] == null) {
+ return;
+ }
+ }
+ StringBuilder sb = new StringBuilder(fields[0].toString());
+ for (int k = 1; k < fields.length; k++) {
+ sb.append(",");
+ sb.append(fields[k].toString());
+ }
+
+ }
+
+ public void setSortColumns(String sortColumns)
+ {
+ if (sortColumns == null || "".equals(sortColumns.trim())) {
+ return;
+ }
+ if (sortColumns.contains(",")) {
+ String[] cols = sortColumns.split(",");
+ java.util.List fList = new java.util.ArrayList();
+ for (int k = 0; k < cols.length; k++) {
+ fList.add(Field.valueOf(cols[k]));
+ }
+ this.setSortColumns(fList.toArray(new Field[fList.size()]));
+ } else {
+ this.setSortColumns(Field.valueOf(sortColumns));
+ }
+ }
+}
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 30c6021b3..70f877766 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreHistory.java
@@ -13,19 +13,21 @@ public class WxScoreHistory implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxScoreHistory implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*会员ID**/
@io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId")
private Integer cUserId;
@@ -60,6 +65,12 @@ public class WxScoreHistory implements Serializable {
/*积分**/
@io.swagger.annotations.ApiModelProperty(value="积分",name="scoreAmount")
private Integer scoreAmount;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public Integer getCUserId() {
return cUserId;
}
@@ -108,6 +119,7 @@ public class WxScoreHistory implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
,ValidDate_ASC("`validDate` ASC"),ValidDate_DESC("`validDate` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java
index d511d1416..d81232178 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java
@@ -13,19 +13,21 @@ public class WxScoreRules implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxScoreRules implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*消费金额**/
@io.swagger.annotations.ApiModelProperty(value="消费金额",name="consumptionAmount")
private BigDecimal consumptionAmount;
/*获取积分**/
@io.swagger.annotations.ApiModelProperty(value="获取积分",name="scoreNumber")
private Integer scoreNumber;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public BigDecimal getConsumptionAmount() {
return consumptionAmount;
}
@@ -63,6 +74,7 @@ public class WxScoreRules implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,ConsumptionAmount_ASC("`consumptionAmount` ASC"),ConsumptionAmount_DESC("`consumptionAmount` DESC")
,ScoreNumber_ASC("`scoreNumber` ASC"),ScoreNumber_DESC("`scoreNumber` DESC")
;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java
index 34ed0ac2d..d3e26e012 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java
@@ -13,19 +13,21 @@ public class WxScoreValidityPeriod implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,9 +41,18 @@ public class WxScoreValidityPeriod implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*年**/
@io.swagger.annotations.ApiModelProperty(value="年",name="year")
private String year;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getYear() {
return year;
}
@@ -54,6 +65,7 @@ public class WxScoreValidityPeriod implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Year_ASC("`year` ASC"),Year_DESC("`year` DESC")
;
private String value;
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java
index 2f37aeaa6..a9b589712 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java
@@ -13,19 +13,21 @@ public class WxShop implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,6 +41,9 @@ public class WxShop implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*商铺名**/
@io.swagger.annotations.ApiModelProperty(value="商铺名",name="title")
private String title;
@@ -69,6 +74,12 @@ public class WxShop implements Serializable {
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getTitle() {
return title;
}
@@ -135,6 +146,7 @@ public class WxShop implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,BuildArea_ASC("`buildArea` ASC"),BuildArea_DESC("`buildArea` DESC")
,OperationArea_ASC("`operationArea` ASC"),OperationArea_DESC("`operationArea` DESC")
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java
index 5da94d453..879edd9a9 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java
@@ -13,19 +13,21 @@ public class WxTags implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,42 +41,52 @@ public class WxTags implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/*名称**/
@io.swagger.annotations.ApiModelProperty(value="名称",name="name")
private String name;
/*1基础2生活属性3消费偏好4行为偏好**/
- @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="type")
- private String type;
- /*二级属性 性别等**/
- @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="type1")
+ @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="type1")
private String type1;
+ /*二级属性 性别等**/
+ @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="type2")
+ private String type2;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getName() {
return name;
}
public void setName(String _name) {
name = _name;
}
- public String getType() {
- return type;
- }
- public void setType(String _type) {
- type = _type;
- }
public String getType1() {
return type1;
}
public void setType1(String _type1) {
type1 = _type1;
}
+ public String getType2() {
+ return type2;
+ }
+ public void setType2(String _type2) {
+ type2 = _type2;
+ }
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Name_ASC("`name` ASC"),Name_DESC("`name` DESC")
- ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,Type1_ASC("`type1` ASC"),Type1_DESC("`type1` DESC")
+ ,Type2_ASC("`type2` ASC"),Type2_DESC("`type2` DESC")
;
private String value;
Field(String value){
diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java
index 851662f5a..d943577bf 100644
--- a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java
+++ b/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java
@@ -13,19 +13,21 @@ public class WxWebLog implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- protected String id;
+ protected Long id;
@Transient
protected List ids;
@Transient
protected String sortColumns;
- public String getId() {
+ public Long getId() {
return id;
}
- public void setId(String id) {
+
+ public void setId(Long id) {
this.id = id;
}
+
public String getSortColumns() {
return sortColumns;
}
@@ -39,12 +41,21 @@ public class WxWebLog implements Serializable {
+ /*租户ID**/
+ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
+ private String tenantId;
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="data")
private String data;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
+ public String getTenantId() {
+ return tenantId;
+ }
+ public void setTenantId(String _tenantId) {
+ tenantId = _tenantId;
+ }
public String getData() {
return data;
}
@@ -63,6 +74,7 @@ public class WxWebLog implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
+ ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Data_ASC("`data` ASC"),Data_DESC("`data` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
;
diff --git a/mallinkService/src/main/java/com/simple/mapper/WxImgUrlMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxImgUrlMapper.java
new file mode 100644
index 000000000..7b97609d7
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/mapper/WxImgUrlMapper.java
@@ -0,0 +1,17 @@
+package com.simple.mapper;
+
+import java.util.*;
+import com.simple.common.CommonMapper;
+import org.apache.ibatis.annotations.Param;
+import com.simple.domain.po.WxImgUrl;
+
+public interface WxImgUrlMapper extends CommonMapper {
+
+ List findList(WxImgUrl wxImgUrl);
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantEtcpMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantEtcpMapper.java
new file mode 100644
index 000000000..77ffae07a
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantEtcpMapper.java
@@ -0,0 +1,17 @@
+package com.simple.mapper;
+
+import java.util.*;
+import com.simple.common.CommonMapper;
+import org.apache.ibatis.annotations.Param;
+import com.simple.domain.po.WxMerchantEtcp;
+
+public interface WxMerchantEtcpMapper extends CommonMapper {
+
+ List findList(WxMerchantEtcp wxMerchantEtcp);
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/mapper/WxParkEtcpMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxParkEtcpMapper.java
new file mode 100644
index 000000000..edc136eea
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/mapper/WxParkEtcpMapper.java
@@ -0,0 +1,17 @@
+package com.simple.mapper;
+
+import java.util.*;
+import com.simple.common.CommonMapper;
+import org.apache.ibatis.annotations.Param;
+import com.simple.domain.po.WxParkEtcp;
+
+public interface WxParkEtcpMapper extends CommonMapper {
+
+ List findList(WxParkEtcp wxParkEtcp);
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java b/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java
new file mode 100644
index 000000000..c7142c2b0
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java
@@ -0,0 +1,48 @@
+package com.simple.service;
+
+import java.util.*;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxImgUrl;
+
+public interface WxImgUrlService {
+
+ /**
+ * 根据实体查询分页列表
+ *
+ * @param record
+ * @param offset
+ * @param limit
+ * @return
+ */
+ PageInfo listAsPage(WxImgUrl record, Integer pageIndex, Integer pageSize);
+
+ /**
+ * 根据Id获得实体
+ *
+ * @param id
+ * @return
+ */
+ WxImgUrl getById(String id);
+
+ /**
+ * 保存或更新实体
+ *
+ * @param record
+ */
+ void saveOrUpdate(WxImgUrl record);
+
+ /**
+ * 根据Id删除实体
+ *
+ * @param id
+ */
+ void deleteById(String id);
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantEtcpService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantEtcpService.java
new file mode 100644
index 000000000..4ea0c2c2b
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/WxMerchantEtcpService.java
@@ -0,0 +1,48 @@
+package com.simple.service;
+
+import java.util.*;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxMerchantEtcp;
+
+public interface WxMerchantEtcpService {
+
+ /**
+ * 根据实体查询分页列表
+ *
+ * @param record
+ * @param offset
+ * @param limit
+ * @return
+ */
+ PageInfo listAsPage(WxMerchantEtcp record, Integer pageIndex, Integer pageSize);
+
+ /**
+ * 根据Id获得实体
+ *
+ * @param id
+ * @return
+ */
+ WxMerchantEtcp getById(String id);
+
+ /**
+ * 保存或更新实体
+ *
+ * @param record
+ */
+ void saveOrUpdate(WxMerchantEtcp record);
+
+ /**
+ * 根据Id删除实体
+ *
+ * @param id
+ */
+ void deleteById(String id);
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java b/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java
new file mode 100644
index 000000000..880e37c85
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java
@@ -0,0 +1,48 @@
+package com.simple.service;
+
+import java.util.*;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxParkEtcp;
+
+public interface WxParkEtcpService {
+
+ /**
+ * 根据实体查询分页列表
+ *
+ * @param record
+ * @param offset
+ * @param limit
+ * @return
+ */
+ PageInfo listAsPage(WxParkEtcp record, Integer pageIndex, Integer pageSize);
+
+ /**
+ * 根据Id获得实体
+ *
+ * @param id
+ * @return
+ */
+ WxParkEtcp getById(String id);
+
+ /**
+ * 保存或更新实体
+ *
+ * @param record
+ */
+ void saveOrUpdate(WxParkEtcp record);
+
+ /**
+ * 根据Id删除实体
+ *
+ * @param id
+ */
+ void deleteById(String id);
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java
index eb54770eb..2bad91942 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxAppinfoServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxAppinfoMapper;
import com.simple.service.WxAppinfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxAppinfoServiceImpl implements WxAppinfoService {
@@ -29,7 +30,9 @@ public class WxAppinfoServiceImpl implements WxAppinfoService {
@Override
public void saveOrUpdate(WxAppinfo record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxAppinfoMapper.insertSelective(record);
} else {
wxAppinfoMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java
index 1e0686d6a..ff3bb2f52 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxBLogServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxBLogMapper;
import com.simple.service.WxBLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxBLogServiceImpl implements WxBLogService {
@@ -29,7 +30,9 @@ public class WxBLogServiceImpl implements WxBLogService {
@Override
public void saveOrUpdate(WxBLog record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxBLogMapper.insertSelective(record);
} else {
wxBLogMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java
index 581ec1ec5..c9b6fd327 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxBUserMerchantServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxBUserMerchantMapper;
import com.simple.service.WxBUserMerchantService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxBUserMerchantServiceImpl implements WxBUserMerchantService {
@@ -29,7 +30,9 @@ public class WxBUserMerchantServiceImpl implements WxBUserMerchantService {
@Override
public void saveOrUpdate(WxBUserMerchant record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxBUserMerchantMapper.insertSelective(record);
} else {
wxBUserMerchantMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java
index 29e78ed73..6ccaa494a 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxBannersMapper;
import com.simple.service.WxBannersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxBannersServiceImpl implements WxBannersService {
@@ -29,7 +30,9 @@ public class WxBannersServiceImpl implements WxBannersService {
@Override
public void saveOrUpdate(WxBanners record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxBannersMapper.insertSelective(record);
} else {
wxBannersMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java
index c52a40dba..57f485ca2 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxBusinessServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxBusinessMapper;
import com.simple.service.WxBusinessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxBusinessServiceImpl implements WxBusinessService {
@@ -29,7 +30,9 @@ public class WxBusinessServiceImpl implements WxBusinessService {
@Override
public void saveOrUpdate(WxBusiness record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxBusinessMapper.insertSelective(record);
} else {
wxBusinessMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java
index 109f0c20c..dffa7c7e3 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCLogServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCLogMapper;
import com.simple.service.WxCLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCLogServiceImpl implements WxCLogService {
@@ -29,7 +30,9 @@ public class WxCLogServiceImpl implements WxCLogService {
@Override
public void saveOrUpdate(WxCLog record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCLogMapper.insertSelective(record);
} else {
wxCLogMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java
index fd347bc4c..b10e54fb8 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarsServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCUserCarsMapper;
import com.simple.service.WxCUserCarsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCUserCarsServiceImpl implements WxCUserCarsService {
@@ -29,7 +30,9 @@ public class WxCUserCarsServiceImpl implements WxCUserCarsService {
@Override
public void saveOrUpdate(WxCUserCars record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCUserCarsMapper.insertSelective(record);
} else {
wxCUserCarsMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java
index cb316a7c8..bff6256b3 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCloudServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCUserCloudMapper;
import com.simple.service.WxCUserCloudService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCUserCloudServiceImpl implements WxCUserCloudService {
@@ -29,7 +30,9 @@ public class WxCUserCloudServiceImpl implements WxCUserCloudService {
@Override
public void saveOrUpdate(WxCUserCloud record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCUserCloudMapper.insertSelective(record);
} else {
wxCUserCloudMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java
index c378a1cab..7a50162b6 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserEtcpTokenServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCUserEtcpTokenMapper;
import com.simple.service.WxCUserEtcpTokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCUserEtcpTokenServiceImpl implements WxCUserEtcpTokenService {
@@ -29,7 +30,9 @@ public class WxCUserEtcpTokenServiceImpl implements WxCUserEtcpTokenService {
@Override
public void saveOrUpdate(WxCUserEtcpToken record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCUserEtcpTokenMapper.insertSelective(record);
} else {
wxCUserEtcpTokenMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java
index 1ff402977..53d38349d 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCUserMapper;
import com.simple.service.WxCUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCUserServiceImpl implements WxCUserService {
@@ -29,7 +30,9 @@ public class WxCUserServiceImpl implements WxCUserService {
@Override
public void saveOrUpdate(WxCUser record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCUserMapper.insertSelective(record);
} else {
wxCUserMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java
index a115c6b17..4d6dec6c5 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCUserTagsMapper;
import com.simple.service.WxCUserTagsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCUserTagsServiceImpl implements WxCUserTagsService {
@@ -29,7 +30,9 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
@Override
public void saveOrUpdate(WxCUserTags record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCUserTagsMapper.insertSelective(record);
} else {
wxCUserTagsMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java
index 0a17d4169..7e21afe2a 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCouponActionLogMapper;
import com.simple.service.WxCouponActionLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
@@ -29,7 +30,9 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
@Override
public void saveOrUpdate(WxCouponActionLog record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCouponActionLogMapper.insertSelective(record);
} else {
wxCouponActionLogMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java
index 9df4ff895..25b62ec3f 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActivityServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCouponActivityMapper;
import com.simple.service.WxCouponActivityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCouponActivityServiceImpl implements WxCouponActivityService {
@@ -29,7 +30,9 @@ public class WxCouponActivityServiceImpl implements WxCouponActivityService {
@Override
public void saveOrUpdate(WxCouponActivity record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCouponActivityMapper.insertSelective(record);
} else {
wxCouponActivityMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java
index 111994780..a3652d5cd 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponRecordServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCouponRecordMapper;
import com.simple.service.WxCouponRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCouponRecordServiceImpl implements WxCouponRecordService {
@@ -29,7 +30,9 @@ public class WxCouponRecordServiceImpl implements WxCouponRecordService {
@Override
public void saveOrUpdate(WxCouponRecord record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCouponRecordMapper.insertSelective(record);
} else {
wxCouponRecordMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java
index 800ad2050..84243eed6 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCouponMapper;
import com.simple.service.WxCouponService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCouponServiceImpl implements WxCouponService {
@@ -29,7 +30,9 @@ public class WxCouponServiceImpl implements WxCouponService {
@Override
public void saveOrUpdate(WxCoupon record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCouponMapper.insertSelective(record);
} else {
wxCouponMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java
index 1d4353140..daebc3370 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponTypeServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxCouponTypeMapper;
import com.simple.service.WxCouponTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxCouponTypeServiceImpl implements WxCouponTypeService {
@@ -29,7 +30,9 @@ public class WxCouponTypeServiceImpl implements WxCouponTypeService {
@Override
public void saveOrUpdate(WxCouponType record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxCouponTypeMapper.insertSelective(record);
} else {
wxCouponTypeMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java
index cf477cbf4..7cb153cf5 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpCouponRecordMapper;
import com.simple.service.WxEtcpCouponRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpCouponRecordServiceImpl implements WxEtcpCouponRecordService {
@@ -29,7 +30,9 @@ public class WxEtcpCouponRecordServiceImpl implements WxEtcpCouponRecordService
@Override
public void saveOrUpdate(WxEtcpCouponRecord record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpCouponRecordMapper.insertSelective(record);
} else {
wxEtcpCouponRecordMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java
index bc0c96f31..01d8679f4 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkDissolutionMapper;
import com.simple.service.WxEtcpParkDissolutionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkDissolutionServiceImpl implements WxEtcpParkDissolutionService {
@@ -29,7 +30,9 @@ public class WxEtcpParkDissolutionServiceImpl implements WxEtcpParkDissolutionSe
@Override
public void saveOrUpdate(WxEtcpParkDissolution record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkDissolutionMapper.insertSelective(record);
} else {
wxEtcpParkDissolutionMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java
index 650f662bd..c5235f939 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkInMapper;
import com.simple.service.WxEtcpParkInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkInServiceImpl implements WxEtcpParkInService {
@@ -29,7 +30,9 @@ public class WxEtcpParkInServiceImpl implements WxEtcpParkInService {
@Override
public void saveOrUpdate(WxEtcpParkIn record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkInMapper.insertSelective(record);
} else {
wxEtcpParkInMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java
index 6a0e9336c..136ea7ab9 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkMsgSucMapper;
import com.simple.service.WxEtcpParkMsgSucService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkMsgSucServiceImpl implements WxEtcpParkMsgSucService {
@@ -29,7 +30,9 @@ public class WxEtcpParkMsgSucServiceImpl implements WxEtcpParkMsgSucService {
@Override
public void saveOrUpdate(WxEtcpParkMsgSuc record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkMsgSucMapper.insertSelective(record);
} else {
wxEtcpParkMsgSucMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java
index cc468fdc4..74478ca9b 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkOrderunpayMapper;
import com.simple.service.WxEtcpParkOrderunpayService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkOrderunpayServiceImpl implements WxEtcpParkOrderunpayService {
@@ -29,7 +30,9 @@ public class WxEtcpParkOrderunpayServiceImpl implements WxEtcpParkOrderunpayServ
@Override
public void saveOrUpdate(WxEtcpParkOrderunpay record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkOrderunpayMapper.insertSelective(record);
} else {
wxEtcpParkOrderunpayMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java
index 0af904755..3903da686 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkOutMapper;
import com.simple.service.WxEtcpParkOutService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkOutServiceImpl implements WxEtcpParkOutService {
@@ -29,7 +30,9 @@ public class WxEtcpParkOutServiceImpl implements WxEtcpParkOutService {
@Override
public void saveOrUpdate(WxEtcpParkOut record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkOutMapper.insertSelective(record);
} else {
wxEtcpParkOutMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java
index b1dd86d31..8cfe34891 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkTransactionMapper;
import com.simple.service.WxEtcpParkTransactionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkTransactionServiceImpl implements WxEtcpParkTransactionService {
@@ -29,7 +30,9 @@ public class WxEtcpParkTransactionServiceImpl implements WxEtcpParkTransactionSe
@Override
public void saveOrUpdate(WxEtcpParkTransaction record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkTransactionMapper.insertSelective(record);
} else {
wxEtcpParkTransactionMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java
index 29a49b9bc..4012837ec 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxEtcpParkUnbindMapper;
import com.simple.service.WxEtcpParkUnbindService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxEtcpParkUnbindServiceImpl implements WxEtcpParkUnbindService {
@@ -29,7 +30,9 @@ public class WxEtcpParkUnbindServiceImpl implements WxEtcpParkUnbindService {
@Override
public void saveOrUpdate(WxEtcpParkUnbind record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxEtcpParkUnbindMapper.insertSelective(record);
} else {
wxEtcpParkUnbindMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java
index 7bdf147f4..5773003c7 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxFlashSaleServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxFlashSaleMapper;
import com.simple.service.WxFlashSaleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxFlashSaleServiceImpl implements WxFlashSaleService {
@@ -29,7 +30,9 @@ public class WxFlashSaleServiceImpl implements WxFlashSaleService {
@Override
public void saveOrUpdate(WxFlashSale record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxFlashSaleMapper.insertSelective(record);
} else {
wxFlashSaleMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxImgUrlServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxImgUrlServiceImpl.java
new file mode 100644
index 000000000..b61a1693e
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxImgUrlServiceImpl.java
@@ -0,0 +1,54 @@
+package com.simple.service.impl;
+
+import java.util.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxImgUrl;
+import com.simple.mapper.WxImgUrlMapper;
+import com.simple.service.WxImgUrlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
+
+@Service
+public class WxImgUrlServiceImpl implements WxImgUrlService {
+
+ @Autowired
+ WxImgUrlMapper wxImgUrlMapper;
+
+
+ @Override
+ public PageInfo listAsPage(WxImgUrl record, Integer pageIndex, Integer pageSize) {
+ return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxImgUrlMapper.findList(record));
+ }
+
+ @Override
+ public WxImgUrl getById(String id) {
+ return wxImgUrlMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void saveOrUpdate(WxImgUrl record) {
+ if (record.getId() == null) {
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
+ wxImgUrlMapper.insertSelective(record);
+ } else {
+ wxImgUrlMapper.updateByPrimaryKeySelective(record);
+ }
+ }
+
+ @Override
+ public void deleteById(String id) {
+ wxImgUrlMapper.deleteByPrimaryKey(id);
+ }
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java
index 34bea37b3..3069c78ef 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallBuildingServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMallBuildingMapper;
import com.simple.service.WxMallBuildingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMallBuildingServiceImpl implements WxMallBuildingService {
@@ -29,7 +30,9 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {
@Override
public void saveOrUpdate(WxMallBuilding record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMallBuildingMapper.insertSelective(record);
} else {
wxMallBuildingMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java
index fba5ba613..654cdaa26 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallFloorServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMallFloorMapper;
import com.simple.service.WxMallFloorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMallFloorServiceImpl implements WxMallFloorService {
@@ -29,7 +30,9 @@ public class WxMallFloorServiceImpl implements WxMallFloorService {
@Override
public void saveOrUpdate(WxMallFloor record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMallFloorMapper.insertSelective(record);
} else {
wxMallFloorMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java
index eec451247..a75040494 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMallServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMallMapper;
import com.simple.service.WxMallService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMallServiceImpl implements WxMallService {
@@ -29,7 +30,9 @@ public class WxMallServiceImpl implements WxMallService {
@Override
public void saveOrUpdate(WxMall record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMallMapper.insertSelective(record);
} else {
wxMallMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantEtcpServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantEtcpServiceImpl.java
new file mode 100644
index 000000000..78a41dc88
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantEtcpServiceImpl.java
@@ -0,0 +1,54 @@
+package com.simple.service.impl;
+
+import java.util.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxMerchantEtcp;
+import com.simple.mapper.WxMerchantEtcpMapper;
+import com.simple.service.WxMerchantEtcpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
+
+@Service
+public class WxMerchantEtcpServiceImpl implements WxMerchantEtcpService {
+
+ @Autowired
+ WxMerchantEtcpMapper wxMerchantEtcpMapper;
+
+
+ @Override
+ public PageInfo listAsPage(WxMerchantEtcp record, Integer pageIndex, Integer pageSize) {
+ return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantEtcpMapper.findList(record));
+ }
+
+ @Override
+ public WxMerchantEtcp getById(String id) {
+ return wxMerchantEtcpMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void saveOrUpdate(WxMerchantEtcp record) {
+ if (record.getId() == null) {
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
+ wxMerchantEtcpMapper.insertSelective(record);
+ } else {
+ wxMerchantEtcpMapper.updateByPrimaryKeySelective(record);
+ }
+ }
+
+ @Override
+ public void deleteById(String id) {
+ wxMerchantEtcpMapper.deleteByPrimaryKey(id);
+ }
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java
index d08c43ca2..71ad8ce7b 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMerchantMapper;
import com.simple.service.WxMerchantService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMerchantServiceImpl implements WxMerchantService {
@@ -29,7 +30,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Override
public void saveOrUpdate(WxMerchant record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMerchantMapper.insertSelective(record);
} else {
wxMerchantMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java
index 965e7f5e9..8e8c5e197 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantShopServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMerchantShopMapper;
import com.simple.service.WxMerchantShopService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMerchantShopServiceImpl implements WxMerchantShopService {
@@ -29,7 +30,9 @@ public class WxMerchantShopServiceImpl implements WxMerchantShopService {
@Override
public void saveOrUpdate(WxMerchantShop record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMerchantShopMapper.insertSelective(record);
} else {
wxMerchantShopMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java
index 1a2275161..b8742e2bb 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDaysServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMerchantTradeDaysMapper;
import com.simple.service.WxMerchantTradeDaysService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMerchantTradeDaysServiceImpl implements WxMerchantTradeDaysService {
@@ -29,7 +30,9 @@ public class WxMerchantTradeDaysServiceImpl implements WxMerchantTradeDaysServic
@Override
public void saveOrUpdate(WxMerchantTradeDays record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMerchantTradeDaysMapper.insertSelective(record);
} else {
wxMerchantTradeDaysMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java
index abd012518..3879e1c5c 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgConfigServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMsgConfigMapper;
import com.simple.service.WxMsgConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMsgConfigServiceImpl implements WxMsgConfigService {
@@ -29,7 +30,9 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService {
@Override
public void saveOrUpdate(WxMsgConfig record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMsgConfigMapper.insertSelective(record);
} else {
wxMsgConfigMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java
index 58e6ce39c..053cb1892 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMsgModelMapper;
import com.simple.service.WxMsgModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMsgModelServiceImpl implements WxMsgModelService {
@@ -29,7 +30,9 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
@Override
public void saveOrUpdate(WxMsgModel record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMsgModelMapper.insertSelective(record);
} else {
wxMsgModelMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java
index 6e2b2656e..e0233a746 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMsgMapper;
import com.simple.service.WxMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMsgServiceImpl implements WxMsgService {
@@ -29,7 +30,9 @@ public class WxMsgServiceImpl implements WxMsgService {
@Override
public void saveOrUpdate(WxMsg record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMsgMapper.insertSelective(record);
} else {
wxMsgMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java
index 60efa5e90..6f8d8dad4 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgSignatureServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxMsgSignatureMapper;
import com.simple.service.WxMsgSignatureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
@@ -29,7 +30,9 @@ public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
@Override
public void saveOrUpdate(WxMsgSignature record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxMsgSignatureMapper.insertSelective(record);
} else {
wxMsgSignatureMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java
index f0e4edb85..f0c34f923 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrdersServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxOrdersMapper;
import com.simple.service.WxOrdersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxOrdersServiceImpl implements WxOrdersService {
@@ -29,7 +30,9 @@ public class WxOrdersServiceImpl implements WxOrdersService {
@Override
public void saveOrUpdate(WxOrders record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxOrdersMapper.insertSelective(record);
} else {
wxOrdersMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxParkEtcpServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxParkEtcpServiceImpl.java
new file mode 100644
index 000000000..f4048c6dd
--- /dev/null
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxParkEtcpServiceImpl.java
@@ -0,0 +1,54 @@
+package com.simple.service.impl;
+
+import java.util.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.simple.domain.po.WxParkEtcp;
+import com.simple.mapper.WxParkEtcpMapper;
+import com.simple.service.WxParkEtcpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
+
+@Service
+public class WxParkEtcpServiceImpl implements WxParkEtcpService {
+
+ @Autowired
+ WxParkEtcpMapper wxParkEtcpMapper;
+
+
+ @Override
+ public PageInfo listAsPage(WxParkEtcp record, Integer pageIndex, Integer pageSize) {
+ return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxParkEtcpMapper.findList(record));
+ }
+
+ @Override
+ public WxParkEtcp getById(String id) {
+ return wxParkEtcpMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void saveOrUpdate(WxParkEtcp record) {
+ if (record.getId() == null) {
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
+ wxParkEtcpMapper.insertSelective(record);
+ } else {
+ wxParkEtcpMapper.updateByPrimaryKeySelective(record);
+ }
+ }
+
+ @Override
+ public void deleteById(String id) {
+ wxParkEtcpMapper.deleteByPrimaryKey(id);
+ }
+
+
+
+
+
+
+
+
+}
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java
index d496e5034..506667503 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxParkServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxParkMapper;
import com.simple.service.WxParkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxParkServiceImpl implements WxParkService {
@@ -29,7 +30,9 @@ public class WxParkServiceImpl implements WxParkService {
@Override
public void saveOrUpdate(WxPark record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxParkMapper.insertSelective(record);
} else {
wxParkMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java
index cfe41fb58..2a3c33c7c 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreHistoryServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxScoreHistoryMapper;
import com.simple.service.WxScoreHistoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxScoreHistoryServiceImpl implements WxScoreHistoryService {
@@ -29,7 +30,9 @@ public class WxScoreHistoryServiceImpl implements WxScoreHistoryService {
@Override
public void saveOrUpdate(WxScoreHistory record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxScoreHistoryMapper.insertSelective(record);
} else {
wxScoreHistoryMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java
index f7fd5b500..7c42ef4f0 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxScoreRulesMapper;
import com.simple.service.WxScoreRulesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxScoreRulesServiceImpl implements WxScoreRulesService {
@@ -29,7 +30,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
@Override
public void saveOrUpdate(WxScoreRules record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxScoreRulesMapper.insertSelective(record);
} else {
wxScoreRulesMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java
index 06020e17e..5f8d072f8 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreValidityPeriodServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxScoreValidityPeriodMapper;
import com.simple.service.WxScoreValidityPeriodService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodService {
@@ -29,7 +30,9 @@ public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodSe
@Override
public void saveOrUpdate(WxScoreValidityPeriod record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxScoreValidityPeriodMapper.insertSelective(record);
} else {
wxScoreValidityPeriodMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java
index 123cdf650..7a6b7a9e6 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxShopMapper;
import com.simple.service.WxShopService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxShopServiceImpl implements WxShopService {
@@ -29,7 +30,9 @@ public class WxShopServiceImpl implements WxShopService {
@Override
public void saveOrUpdate(WxShop record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxShopMapper.insertSelective(record);
} else {
wxShopMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java
index 52a76acc4..203ff4a96 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxTagsServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxTagsMapper;
import com.simple.service.WxTagsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxTagsServiceImpl implements WxTagsService {
@@ -29,7 +30,9 @@ public class WxTagsServiceImpl implements WxTagsService {
@Override
public void saveOrUpdate(WxTags record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxTagsMapper.insertSelective(record);
} else {
wxTagsMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java
index a921d04d1..2754a4bec 100644
--- a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java
+++ b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java
@@ -8,6 +8,7 @@ import com.simple.mapper.WxWebLogMapper;
import com.simple.service.WxWebLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.simple.common.IdWorker;
@Service
public class WxWebLogServiceImpl implements WxWebLogService {
@@ -29,7 +30,9 @@ public class WxWebLogServiceImpl implements WxWebLogService {
@Override
public void saveOrUpdate(WxWebLog record) {
if (record.getId() == null) {
- record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+ IdWorker idWorker = new IdWorker(0, 0);
+ record.setId(idWorker.nextId());
wxWebLogMapper.insertSelective(record);
} else {
wxWebLogMapper.updateByPrimaryKeySelective(record);
diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml
index 06850f38e..a7ca0e9ab 100644
--- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml
@@ -3,6 +3,7 @@
+
@@ -14,12 +15,13 @@
- `id`,`appid`,`secret`,`name`,`token`,`aeskey`,`access_token`,`last_token_time`,`expires_in`
+ `id`,`tenant_id`,`appid`,`secret`,`name`,`token`,`aeskey`,`access_token`,`last_token_time`,`expires_in`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `appid` = #{appid}
and `secret` = #{secret}
and `name` = #{name}
diff --git a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml
index efdc285f3..fb1881123 100644
--- a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`data`,`create_date`
+ `id`,`tenant_id`,`data`,`create_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `data` = #{data}
and `create_date` = #{createDate}
diff --git a/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml
index 483fa7b2a..d1dcec8ae 100644
--- a/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBUserMerchantMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`b_user_id`,`merchant_id`
+ `id`,`tenant_id`,`b_user_id`,`merchant_id`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `b_user_id` = #{bUserId}
and `merchant_id` = #{merchantId}
diff --git a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml b/mallinkService/src/main/resources/mapper/WxBannersMapper.xml
index 41c7fc429..74e3ebbd4 100644
--- a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBannersMapper.xml
@@ -3,6 +3,7 @@
+
@@ -14,12 +15,13 @@
- `id`,`face_pic_url`,`activity_type`,`url`,`order`,`createtime`,`uptime`,`desc`,`is_enable`
+ `id`,`tenant_id`,`face_pic_url`,`activity_type`,`url`,`order`,`createtime`,`uptime`,`desc`,`is_enable`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `face_pic_url` = #{facePicUrl}
and `activity_type` = #{activityType}
and `url` = #{url}
diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml
index f5586d37a..3c88739c8 100644
--- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml
@@ -3,16 +3,18 @@
+
- `id`,`title`
+ `id`,`tenant_id`,`title`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `title` = #{title}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml
index 590035d4a..6a03f7d6f 100644
--- a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`data`,`create_date`
+ `id`,`tenant_id`,`data`,`create_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `data` = #{data}
and `create_date` = #{createDate}
diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml
index c7aabbc11..cc3b838ed 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`c_user_id`,`car_number`
+ `id`,`tenant_id`,`c_user_id`,`car_number`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `c_user_id` = #{cUserId}
and `car_number` = #{carNumber}
diff --git a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml
index 6580ad6fb..0fdd83e5d 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml
@@ -3,19 +3,21 @@
-
+
+
- `id`,`cloud_data`,`c_user_id`
+ `id`,`tenant_id`,`c_user_id`,`cloud_data`
where 1 = 1
and `id` = #{id}
- and `cloud_data` = #{cloudData}
+ and `tenant_id` = #{tenantId}
and `c_user_id` = #{cUserId}
+ and `cloud_data` = #{cloudData}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml
index c235c3dec..088832757 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserEtcpTokenMapper.xml
@@ -3,6 +3,7 @@
+
@@ -10,12 +11,13 @@
- `id`,`c_user_id`,`etcp_token`,`etcp_create_time`,`etcp_update_time`
+ `id`,`tenant_id`,`c_user_id`,`etcp_token`,`etcp_create_time`,`etcp_update_time`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `c_user_id` = #{cUserId}
and `etcp_token` = #{etcpToken}
and `etcp_create_time` = #{etcpCreateTime}
diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml
index 7829291dc..18fd7b239 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml
@@ -3,6 +3,7 @@
+
@@ -25,12 +26,13 @@
- `id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`,`city`,`province`,`language`,`country_code`,`qrcode_source`,`register_ip`,`scene`,`scene_address`,`session_key`,`update_date`,`create_date`,`score`
+ `id`,`tenant_id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`,`city`,`province`,`language`,`country_code`,`qrcode_source`,`register_ip`,`scene`,`scene_address`,`session_key`,`update_date`,`create_date`,`score`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `open_id` = #{openId}
and `union_id` = #{unionId}
and `nick_name` = #{nickName}
diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml
index 6afaa87ff..9c5c877d2 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`user_id`,`tags`
+ `id`,`tenant_id`,`user_id`,`tags`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `user_id` = #{userId}
and `tags` = #{tags}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml
index 605d17622..4229db599 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml
@@ -3,23 +3,23 @@
+
-
-
+
- `id`,`coupon_id`,`c_user_id`,`b_user_id`,`action`,`operation_time`
+ `id`,`tenant_id`,`coupon_id`,`user_id`,`action`,`operation_time`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `coupon_id` = #{couponId}
- and `c_user_id` = #{cUserId}
- and `b_user_id` = #{bUserId}
+ and `user_id` = #{userId}
and `action` = #{action}
and `operation_time` = #{operationTime}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml
index 045670973..6c9f30831 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml
@@ -3,8 +3,9 @@
-
+
+
@@ -27,14 +28,15 @@
- `id`,`type`,`merchant_id`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_start_date`,`send_end_date`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`send_type`,`target_ad`,`businesses`,`price`,`number`,`total`,`status`
+ `id`,`tenant_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_start_date`,`send_end_date`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`send_type`,`target_ad`,`businesses`,`price`,`number`,`total`,`status`
where 1 = 1
and `id` = #{id}
- and `type` = #{type}
+ and `tenant_id` = #{tenantId}
and `merchant_id` = #{merchantId}
+ and `type` = #{type}
and `cover_img` = #{coverImg}
and `title` = #{title}
and `sub_title` = #{subTitle}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 187039093..5601144ab 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -3,9 +3,10 @@
+
-
+
@@ -20,15 +21,16 @@
- `id`,`activity_id`,`type`,`merchant_id`,`cover_img`,`title`,`sub_title`,`detail`,`price`,`sale_price`,`use_price`,`business`,`status`,`create_date`,`update_date`
+ `id`,`tenant_id`,`activity_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`detail`,`price`,`sale_price`,`use_price`,`business`,`status`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `activity_id` = #{activityId}
- and `type` = #{type}
and `merchant_id` = #{merchantId}
+ and `type` = #{type}
and `cover_img` = #{coverImg}
and `title` = #{title}
and `sub_title` = #{subTitle}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml
index 57d2f8f8f..4cf0e70e0 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponRecordMapper.xml
@@ -3,6 +3,7 @@
+
@@ -15,12 +16,13 @@
- `id`,`coupon_id`,`order_id`,`c_user_id`,`buy_date`,`limit_date`,`c_status`,`b_user_id`,`verification_date`,`verification_status`
+ `id`,`tenant_id`,`coupon_id`,`order_id`,`c_user_id`,`buy_date`,`limit_date`,`c_status`,`b_user_id`,`verification_date`,`verification_status`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `coupon_id` = #{couponId}
and `order_id` = #{orderId}
and `c_user_id` = #{cUserId}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml
index adc34f1ae..e725504cf 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml
@@ -3,6 +3,7 @@
+
@@ -15,12 +16,13 @@
- `id`,`coupon_id`,`car_number`,`park_id`,`business_id`,`coupon_free_id`,`code`,`message`,`create_date`,`update_date`
+ `id`,`tenant_id`,`coupon_id`,`car_number`,`park_id`,`business_id`,`coupon_free_id`,`code`,`message`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `coupon_id` = #{couponId}
and `car_number` = #{carNumber}
and `park_id` = #{parkId}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml
index 385e1084a..4e601ed0b 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml
@@ -3,16 +3,18 @@
+
- `id`,`sign_no`
+ `id`,`tenant_id`,`sign_no`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `sign_no` = #{signNo}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml
index 0b31b40f1..b48a536f3 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml
@@ -3,18 +3,20 @@
+
- `id`,`syn_id`,`plate_number`,`park_name`
+ `id`,`tenant_id`,`syn_id`,`plate_number`,`park_name`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `syn_id` = #{synId}
and `plate_number` = #{plateNumber}
and `park_name` = #{parkName}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml
index 52479013d..45219bcf8 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml
@@ -3,16 +3,18 @@
+
- `id`,`sign_no`
+ `id`,`tenant_id`,`sign_no`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `sign_no` = #{signNo}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml
index b41acb9ad..b21300e91 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml
@@ -3,6 +3,7 @@
+
@@ -24,12 +25,13 @@
- `id`,`plate_number`,`code`,`message`,`data`,`entrance_time`,`parking_fee`,`remaining_fee`,`paid_fee`,`parking_id`,`discount_amount`,`order_id`,`car_number`,`verification_info`,`syn_id`,`discount_no`,`status`,`create_date`,`update_date`
+ `id`,`tenant_id`,`plate_number`,`code`,`message`,`data`,`entrance_time`,`parking_fee`,`remaining_fee`,`paid_fee`,`parking_id`,`discount_amount`,`order_id`,`car_number`,`verification_info`,`syn_id`,`discount_no`,`status`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `plate_number` = #{plateNumber}
and `code` = #{code}
and `message` = #{message}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml
index 5d324c030..d76bf61dd 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml
@@ -3,18 +3,20 @@
+
- `id`,`syn_id`,`plate_number`,`park_name`
+ `id`,`tenant_id`,`syn_id`,`plate_number`,`park_name`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `syn_id` = #{synId}
and `plate_number` = #{plateNumber}
and `park_name` = #{parkName}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml
index f86ad0736..9b6e9121c 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml
@@ -3,6 +3,7 @@
+
@@ -16,12 +17,13 @@
- `id`,`pay_type`,`syn_id`,`return_url`,`coupon_code`,`code`,`message`,`data`,`status`,`create_date`,`update_date`
+ `id`,`tenant_id`,`pay_type`,`syn_id`,`return_url`,`coupon_code`,`code`,`message`,`data`,`status`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `pay_type` = #{payType}
and `syn_id` = #{synId}
and `return_url` = #{returnUrl}
diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml
index db3c01d04..e101d2576 100644
--- a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml
@@ -3,16 +3,18 @@
+
- `id`,`plate_number`
+ `id`,`tenant_id`,`plate_number`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `plate_number` = #{plateNumber}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml
index f0fb489d2..f93e8a612 100644
--- a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml
@@ -3,6 +3,7 @@
+
@@ -10,12 +11,13 @@
- `id`,`activity_id`,`createtime`,`uptime`,`is_enable`
+ `id`,`tenant_id`,`activity_id`,`createtime`,`uptime`,`is_enable`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `activity_id` = #{activityId}
and `createtime` = #{createtime}
and `uptime` = #{uptime}
diff --git a/mallinkService/src/main/resources/mapper/WxImgUrlMapper.xml b/mallinkService/src/main/resources/mapper/WxImgUrlMapper.xml
new file mode 100644
index 000000000..997895a39
--- /dev/null
+++ b/mallinkService/src/main/resources/mapper/WxImgUrlMapper.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ `id`,`address`,`sign`
+
+
+
+ where 1 = 1
+ and `id` = #{id}
+ and `address` = #{address}
+ and `sign` = #{sign}
+
+ and id in
+
+ #{idItem}
+
+
+ order by ${sortColumns}
+
+
+
+
+
+
+
+
+
+
diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml
index 64386187d..fad867c90 100644
--- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml
@@ -3,18 +3,20 @@
+
- `id`,`mall_id`,`name`,`floor_number`
+ `id`,`tenant_id`,`mall_id`,`name`,`floor_number`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `mall_id` = #{mallId}
and `name` = #{name}
and `floor_number` = #{floorNumber}
diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml
index 4f68ed2bf..33cdf04f6 100644
--- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml
@@ -3,18 +3,20 @@
+
- `id`,`mall_id`,`building_id`,`floor_name`
+ `id`,`tenant_id`,`mall_id`,`building_id`,`floor_name`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `mall_id` = #{mallId}
and `building_id` = #{buildingId}
and `floor_name` = #{floorName}
diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml
index 2f2874105..cb3133330 100644
--- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml
@@ -3,6 +3,7 @@
+
@@ -10,7 +11,6 @@
-
@@ -18,12 +18,13 @@
- `id`,`name`,`group`,`country`,`province`,`city`,`addr`,`wiwide_id`,`etcp_id`,`total_area`,`operating_area`,`park_area`,`park_place_number`
+ `id`,`tenant_id`,`name`,`group`,`country`,`province`,`city`,`addr`,`wiwide_id`,`total_area`,`operating_area`,`park_area`,`park_place_number`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `name` = #{name}
and `group` = #{group}
and `country` = #{country}
@@ -31,7 +32,6 @@
and `city` = #{city}
and `addr` = #{addr}
and `wiwide_id` = #{wiwideId}
- and `etcp_id` = #{etcpId}
and `total_area` = #{totalArea}
and `operating_area` = #{operatingArea}
and `park_area` = #{parkArea}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantEtcpMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantEtcpMapper.xml
new file mode 100644
index 000000000..a0d9fcf27
--- /dev/null
+++ b/mallinkService/src/main/resources/mapper/WxMerchantEtcpMapper.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ `id`,`merchant_id`,`etcp_merchant_id`
+
+
+
+ where 1 = 1
+ and `id` = #{id}
+ and `merchant_id` = #{merchantId}
+ and `etcp_merchant_id` = #{etcpMerchantId}
+
+ and id in
+
+ #{idItem}
+
+
+ order by ${sortColumns}
+
+
+
+
+
+
+
+
+
+
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index ccdc3bbb9..2b5f0dc79 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -3,29 +3,29 @@
+
-
- `id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`merchant_id`,`etcp_merchant_id`
+ `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`merchant_id`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `img_url` = #{imgUrl}
and `name` = #{name}
and `link_phone` = #{linkPhone}
and `bank_card` = #{bankCard}
and `bank_name` = #{bankName}
and `merchant_id` = #{merchantId}
- and `etcp_merchant_id` = #{etcpMerchantId}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml
index 67432cf11..cae5ddd97 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`merchant_id`,`shop_id`
+ `id`,`tenant_id`,`merchant_id`,`shop_id`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `merchant_id` = #{merchantId}
and `shop_id` = #{shopId}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml
index 215ebe0fe..08e26ffb2 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDaysMapper.xml
@@ -3,18 +3,20 @@
+
- `id`,`merchant_id`,`trade_amt`,`create_date`
+ `id`,`tenant_id`,`merchant_id`,`trade_amt`,`create_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `merchant_id` = #{merchantId}
and `trade_amt` = #{tradeAmt}
and `create_date` = #{createDate}
diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
index b6195697d..e9d55fe84 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
@@ -3,6 +3,7 @@
+
@@ -16,12 +17,13 @@
- `id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone`
+ `id`,`tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `secret` = #{secret}
and `publickey` = #{publickey}
and `bid` = #{bid}
diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml
index 95f444ce0..cca8a6ca1 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml
@@ -3,6 +3,7 @@
+
@@ -15,12 +16,13 @@
- `id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`
+ `id`,`tenant_id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `model_id` = #{modelId}
and `msg` = #{msg}
and `sendtime` = #{sendtime}
diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
index da1305a17..74909ca76 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
@@ -3,6 +3,7 @@
+
@@ -11,12 +12,13 @@
- `id`,`name`,`signature`,`content`,`createtime`,`status`
+ `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `name` = #{name}
and `signature` = #{signature}
and `content` = #{content}
diff --git a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml
index 6f884338b..63812e7db 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgSignatureMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`name`,`createtime`
+ `id`,`tenant_id`,`name`,`createtime`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `name` = #{name}
and `createtime` = #{createtime}
diff --git a/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml
index 05cfce8fb..69f3a8273 100644
--- a/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxOrdersMapper.xml
@@ -3,6 +3,7 @@
+
@@ -12,12 +13,13 @@
- `id`,`coupon_id`,`c_user_id`,`payment`,`status`,`create_date`,`update_date`
+ `id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`status`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `coupon_id` = #{couponId}
and `c_user_id` = #{cUserId}
and `payment` = #{payment}
diff --git a/mallinkService/src/main/resources/mapper/WxParkEtcpMapper.xml b/mallinkService/src/main/resources/mapper/WxParkEtcpMapper.xml
new file mode 100644
index 000000000..4e96b42cd
--- /dev/null
+++ b/mallinkService/src/main/resources/mapper/WxParkEtcpMapper.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ `id`,`park_id`,`etcp_park_id`
+
+
+
+ where 1 = 1
+ and `id` = #{id}
+ and `park_id` = #{parkId}
+ and `etcp_park_id` = #{etcpParkId}
+
+ and id in
+
+ #{idItem}
+
+
+ order by ${sortColumns}
+
+
+
+
+
+
+
+
+
+
diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml
index e601b1b5b..faa8b2384 100644
--- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml
@@ -3,6 +3,7 @@
+
@@ -10,12 +11,13 @@
- `id`,`addr`,`number`,`etcp_park_id`,`entry_exit`
+ `id`,`tenant_id`,`addr`,`number`,`etcp_park_id`,`entry_exit`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `addr` = #{addr}
and `number` = #{number}
and `etcp_park_id` = #{etcpParkId}
diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml
index 83ee09ebf..911404a55 100644
--- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml
@@ -3,6 +3,7 @@
+
@@ -13,12 +14,13 @@
- `id`,`c_user_id`,`create_date`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`
+ `id`,`tenant_id`,`c_user_id`,`create_date`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `c_user_id` = #{cUserId}
and `create_date` = #{createDate}
and `valid_date` = #{validDate}
diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml
index a2a425e43..a6046d2e6 100644
--- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`consumption_amount`,`score_number`
+ `id`,`tenant_id`,`consumption_amount`,`score_number`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `consumption_amount` = #{consumptionAmount}
and `score_number` = #{scoreNumber}
diff --git a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml
index d0eff8fb3..8996ad8af 100644
--- a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml
@@ -3,16 +3,18 @@
+
- `id`,`year`
+ `id`,`tenant_id`,`year`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `year` = #{year}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
index 8798b1c28..22fd0713b 100644
--- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml
@@ -3,6 +3,7 @@
+
@@ -16,12 +17,13 @@
- `id`,`title`,`build_area`,`operation_area`,`building`,`floor`,`x`,`y`,`baidu_poi`,`create_date`,`update_date`
+ `id`,`tenant_id`,`title`,`build_area`,`operation_area`,`building`,`floor`,`x`,`y`,`baidu_poi`,`create_date`,`update_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `title` = #{title}
and `build_area` = #{buildArea}
and `operation_area` = #{operationArea}
diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml
index a39e1e8f0..74c7ebf96 100644
--- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml
@@ -3,21 +3,23 @@
+
-
+
- `id`,`name`,`type`,`type1`
+ `id`,`tenant_id`,`name`,`type1`,`type2`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `name` = #{name}
- and `type` = #{type}
and `type1` = #{type1}
+ and `type2` = #{type2}
and id in
diff --git a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml
index 79ccec951..040011e72 100644
--- a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml
@@ -3,17 +3,19 @@
+
- `id`,`data`,`create_date`
+ `id`,`tenant_id`,`data`,`create_date`
where 1 = 1
and `id` = #{id}
+ and `tenant_id` = #{tenantId}
and `data` = #{data}
and `create_date` = #{createDate}