From de6dd9e3d58c7193bde389aa5be32a3af998e04d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 15:35:46 +0800 Subject: [PATCH 001/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906031540__ADD_BOX_METER_TABLE.sql | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql new file mode 100644 index 000000000..870ba61f8 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql @@ -0,0 +1,95 @@ +drop table if exists `kw_box`; +CREATE TABLE IF NOT EXISTS `kw_box` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号', + `iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号', + `place` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '位置', + `fw_version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '固件版本号', + `hd_version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '硬件版本号', + `status` smallint(2) NOT NULL COMMENT '注册状态0出厂已注册1', + `online` smallint(2) NOT NULL COMMENT '在线状态1在线0离线', + `register_time` datetime NOT NULL COMMENT '注册时间', + `last_online_time` datetime NOT NULL COMMENT '最后一次在线时间', + `config` json DEFAULT NULL COMMENT '配置', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盒子表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +drop table if exists `kw_meters`; +CREATE TABLE IF NOT EXISTS `kw_meters` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '电表编号', + `brand` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '品牌', + `model` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '型号', + `place` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '位置', + `protocol` smallint(2) DEFAULT 0 COMMENT '协议(0,97协议)(1,07协议)', + `bandrate` int(5) DEFAULT 1200 COMMENT '波特率1200,2400,9600', + `online` smallint(2) NOT NULL COMMENT '在线状态1在线0离线', + `config` json DEFAULT NULL COMMENT '配置', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='电表表' CHECKSUM=0 DELAY_KEY_WRITE=0; + + +drop table if exists `kw_merchant_meter`; +CREATE TABLE IF NOT EXISTS `kw_merchant_meter` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `meter_id` bigint(20) NOT NULL COMMENT '电表ID', + `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', + `status` smallint(2) NOT NULL COMMENT '状态1历史0在用', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='商户电表关联表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +drop table if exists `kw_box_meter`; +CREATE TABLE IF NOT EXISTS `kw_box_meter` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `meter_id` bigint(20) NOT NULL COMMENT '电表ID', + `box_id` bigint(20) NOT NULL COMMENT '盒子ID', + `status` smallint(2) NOT NULL COMMENT '状态1历史0在用', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盒子电表关联表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +drop table if exists `kw_box_cmd_history`; +CREATE TABLE IF NOT EXISTS `kw_box_cmd_history` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号', + `iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号', + `cmd` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '命令类型', + `info` json DEFAULT NULL COMMENT '配置', + `device_time` datetime NOT NULL COMMENT '设备命令上传记录时间', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='命令历史表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +drop table if exists `kw_meter_data`; +CREATE TABLE IF NOT EXISTS `kw_meter_data` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `meter_id` bigint(20) NOT NULL COMMENT '电表ID', + `box_id` bigint(20) NOT NULL COMMENT '盒子ID', + `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '电表编号', + `result` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '度数', + `device_time` datetime NOT NULL COMMENT '设备命令上传记录时间', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='电表数据表' CHECKSUM=0 DELAY_KEY_WRITE=0; + From 5bbc6315a26e22d834bc6d84475f6af35e89b7bc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 16:27:25 +0800 Subject: [PATCH 002/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8sql=E5=8F=8A=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906031540__ADD_BOX_METER_TABLE.sql | 2 +- .../java/com/iformall/domain/po/KwBox.java | 128 ++++++++++++++++++ .../iformall/domain/po/KwBoxCmdHistory.java | 113 ++++++++++++++++ .../com/iformall/domain/po/KwBoxMeter.java | 107 +++++++++++++++ .../iformall/domain/po/KwMerchantMeter.java | 107 +++++++++++++++ .../com/iformall/domain/po/KwMeterData.java | 113 ++++++++++++++++ .../java/com/iformall/domain/po/KwMeters.java | 128 ++++++++++++++++++ 7 files changed, 697 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwBox.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql index 870ba61f8..ce70d2025 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql @@ -70,7 +70,7 @@ CREATE TABLE IF NOT EXISTS `kw_box_cmd_history` ( `imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号', `iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号', `cmd` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '命令类型', - `info` json DEFAULT NULL COMMENT '配置', + `info` json DEFAULT NULL COMMENT '信息', `device_time` datetime NOT NULL COMMENT '设备命令上传记录时间', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java new file mode 100644 index 000000000..51e5385f4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -0,0 +1,128 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_box") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwBox extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei") + private String imei; + + @io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid") + private String iccid; + + @io.swagger.annotations.ApiModelProperty(value = "位置", name = "place") + private String place; + + @io.swagger.annotations.ApiModelProperty(value = "固件版本号", name = "fwVersion") + private String fw_version; + + @io.swagger.annotations.ApiModelProperty(value = "硬件版本号", name = "hdVersion") + private String hd_version; + + @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "status") + private Integer status; + + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") + private Integer online; + + @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") + private String config; + + @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime") + private Date registerTime; + + @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime") + private Date lastOnlineTime; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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/iformall/domain/po/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java new file mode 100644 index 000000000..f34184f6d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -0,0 +1,113 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_box_cmd_history") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwBoxCmdHistory extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei") + private String imei; + + @io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid") + private String iccid; + + @io.swagger.annotations.ApiModelProperty(value = "'命令类型", name = "cmd") + private String cmd; + + @io.swagger.annotations.ApiModelProperty(value = "'信息", name = "info") + private String info; + + @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") + private Date deviceTime; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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/iformall/domain/po/KwBoxMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java new file mode 100644 index 000000000..25a6d2623 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java @@ -0,0 +1,107 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_box_meter") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwBoxMeter extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") + private Long meterId; + + @io.swagger.annotations.ApiModelProperty(value = "盒子ID", name = "boxId") + private Long boxId; + + @io.swagger.annotations.ApiModelProperty(value = "状态1历史0在用", name = "status") + private Integer status; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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/iformall/domain/po/KwMerchantMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java new file mode 100644 index 000000000..f463cf245 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java @@ -0,0 +1,107 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_merchant_meter") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwMerchantMeter extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") + private Long meterId; + + @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") + private Long merchantId; + + @io.swagger.annotations.ApiModelProperty(value = "状态1历史0在用", name = "status") + private Integer status; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java new file mode 100644 index 000000000..39d60bcba --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -0,0 +1,113 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_meter_data") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwMeterData extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") + private Long meterId; + + @io.swagger.annotations.ApiModelProperty(value = "盒子ID", name = "boxId") + private Long boxId; + + @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") + private String address; + + @io.swagger.annotations.ApiModelProperty(value = "度数", name = "result") + private String result; + + @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") + private Date deviceTime; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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/iformall/domain/po/KwMeters.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java new file mode 100644 index 000000000..bf8cb2fb3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java @@ -0,0 +1,128 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Table(name = "kw_meters") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class KwMeters extends BaseEntity { + @Id + protected Long id; + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") + private String address; + + @io.swagger.annotations.ApiModelProperty(value = "品牌", name = "brand") + private String brand; + + @io.swagger.annotations.ApiModelProperty(value = "型号", name = "model") + private String model; + + @io.swagger.annotations.ApiModelProperty(value = "位置", name = "place") + private String place; + + @io.swagger.annotations.ApiModelProperty(value = "协议(0,97协议)(1,07协议)", name = "protocol") + private Integer protocol; + + @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") + private Integer bandrate; + + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") + private Integer online; + + @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") + private String config; + + @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime") + private Date registerTime; + + @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime") + private Date lastOnlineTime; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + + @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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)); + } + } +} From cbffff6233939bc9920fe8e426dfe3e09a19eb66 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 3 Jun 2019 17:02:12 +0800 Subject: [PATCH 003/289] =?UTF-8?q?[=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906031645__L_ALTER_MSG.sql | 7 +++++++ .../db/migration/V201906031651__L_ALTER_MSG.sql | 1 + .../service/impl/WxPropertyContractServiceImpl.java | 12 ++++++++---- .../service/impl/WxRentContractServiceImpl.java | 11 +++++++---- 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql new file mode 100644 index 000000000..6b0df422e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql @@ -0,0 +1,7 @@ +update wx_bill_rent set is_preview = 0 where rent_contract_id in( +select id from wx_rent_contract where apply_status = 2 +); + +update wx_bill_property set is_preview = 0 where property_contract_id in( +select id from wx_property_contract where apply_status = 2 +); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql new file mode 100644 index 000000000..dd4a93681 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql @@ -0,0 +1 @@ +alter table wx_merchant_trade_daily modify column trade_amt BIGINT(20); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 657f3dc23..5612a454c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -358,7 +358,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //建立账单 WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) - && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { + && record.getReceivePeriod() != null && record.getPrice() > 0) { //WxBillProperty wxBillProperty = new WxBillProperty(); //wxBillProperty.setMerchantId(record.getMerchantId()); //List> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); @@ -560,20 +560,24 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService priceD = new Double(price)/12; } + SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); if(i == 0){//第一期 if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ - needpay = new Double(receivePeriod * priceD).longValue(); + int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); }else{ needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } }else{ - needpay = new Double(receivePeriod * priceD).longValue(); + int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); } }else if(i == billTimeVoList.size()-1){//最后 needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 - needpay = new Double(receivePeriod * priceD).longValue(); + int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 858918dde..029fa65ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -950,20 +950,24 @@ public class WxRentContractServiceImpl implements WxRentContractService { priceD = new Double(price)/12; } + SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); if(i == 0){//第一期 if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ - needpay = new Double(receivePeriod * priceD).longValue(); + int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); }else{ needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } }else{ - needpay = new Double(receivePeriod * priceD).longValue(); + int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); } }else if(i == billTimeVoList.size()-1){//最后 needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 - needpay = new Double(receivePeriod * priceD).longValue(); + int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + needpay = new Double(months * priceD).longValue(); } } @@ -1277,7 +1281,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && - record.getDeposit() > 0 && record.getPrice() > 0) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setMerchantId(record.getMerchantId()); From d223c7d2f22455cdc4f03ee183dd6ff586452cb7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 17:11:44 +0800 Subject: [PATCH 004/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E4=B8=8E=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E6=8A=BC=E9=87=91][=E4=BF=AE=E6=94=B9][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillDepositServiceImpl.java | 1 + .../iformall/service/impl/WxBillPropertyDepositServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 3dd37dcf8..496cab032 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -200,6 +200,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } + wxBillDeposit.setPayWay(record.getPayWay()); wxBillDeposit.setReturnPrice(record.getReturnPrice()); wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); wxBillDeposit.setUpdatetime(new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index b3dd0c211..3e18ccb29 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -198,6 +198,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe if (wxBillDeposit == null) { return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } + wxBillDeposit.setPayWay(record.getPayWay()); wxBillDeposit.setReturnPrice(record.getReturnPrice()); wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); wxBillDeposit.setUpdatetime(new Date()); From 53ca49dc2936c4e40293794ea08a8074941eed65 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 17:13:39 +0800 Subject: [PATCH 005/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E8=A1=A8MAPPER=E5=8F=8Axml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/KwBoxCmdHistoryMapper.java | 13 ++++ .../java/com/iformall/mapper/KwBoxMapper.java | 13 ++++ .../com/iformall/mapper/KwBoxMeterMapper.java | 13 ++++ .../mapper/KwMerchantMeterMapper.java | 13 ++++ .../iformall/mapper/KwMeterDataMapper.java | 13 ++++ .../com/iformall/mapper/KwMetersMapper.java | 13 ++++ .../src/main/resources/mapper/KwBoxMapper.xml | 74 +++++++++++++++++++ 7 files changed, 152 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwBoxCmdHistoryMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwBoxMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwMeterDataMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java create mode 100644 mallinkService/src/main/resources/mapper/KwBoxMapper.xml diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwBoxCmdHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwBoxCmdHistoryMapper.java new file mode 100644 index 000000000..56a4a170b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwBoxCmdHistoryMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwBoxCmdHistory; + +import java.util.List; + +public interface KwBoxCmdHistoryMapper extends CommonMapper { + + List findList(KwBoxCmdHistory param); + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwBoxMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwBoxMapper.java new file mode 100644 index 000000000..2e0dd2e79 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwBoxMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwBox; + +import java.util.List; + +public interface KwBoxMapper extends CommonMapper { + + List findList(KwBox param); + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java new file mode 100644 index 000000000..e29f65513 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwBoxMeter; + +import java.util.List; + +public interface KwBoxMeterMapper extends CommonMapper { + + List findList(KwBoxMeter param); + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java new file mode 100644 index 000000000..656828d50 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwMerchantMeter; + +import java.util.List; + +public interface KwMerchantMeterMapper extends CommonMapper { + + List findList(KwMerchantMeter param); + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMeterDataMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMeterDataMapper.java new file mode 100644 index 000000000..566b27cb9 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMeterDataMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwMeterData; + +import java.util.List; + +public interface KwMeterDataMapper extends CommonMapper { + + List findList(KwMeterData param); + + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java new file mode 100644 index 000000000..d46988893 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.KwMeters; + +import java.util.List; + +public interface KwMetersMapper extends CommonMapper { + + List findList(KwMeters param); + + +} diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml new file mode 100644 index 000000000..195778ab5 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`status`,`online`,`register_time`, + `last_online_time`,`config`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `imei` like concat('%', #{imei},'%') + + + + and `iccid` like concat('%', #{iccid},'%') + + + + and `place` like concat('%', #{place},'%') + + + + and `status` = #{status} + + + + and `online` = #{online} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + From 73a1b901dda5916f7857a750b7b384962c1a662e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 17:18:58 +0800 Subject: [PATCH 006/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...BOX_METER_TABLE.sql => V201906031730__ADD_BOX_METER_TABLE.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201906031540__ADD_BOX_METER_TABLE.sql => V201906031730__ADD_BOX_METER_TABLE.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql From 07f2d5bcdc9eeaaba9a6211c00dce6fca2d830d1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 3 Jun 2019 18:29:41 +0800 Subject: [PATCH 007/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=B5=E8=A1=A8=E8=A1=A8mapper.xml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/KwBoxMapper.xml | 2 +- .../main/resources/mapper/KwMetersMapper.xml | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/resources/mapper/KwMetersMapper.xml diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index 195778ab5..4ad622975 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml b/mallinkService/src/main/resources/mapper/KwMetersMapper.xml new file mode 100644 index 000000000..e6bcf67e3 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwMetersMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online`,`config`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `address` like concat('%', #{address},'%') + + + + and `brand` like concat('%', #{brand},'%') + + + + and `place` like concat('%', #{place},'%') + + + + and `model` = #{model} + + + + and `online` = #{online} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + From 5cd04058b25ea39f0d24ca19d679fd656b699f68 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 3 Jun 2019 18:56:50 +0800 Subject: [PATCH 008/289] =?UTF-8?q?[=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 11 ++++++++++- .../service/impl/WxRentContractServiceImpl.java | 14 +++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 5612a454c..292a23033 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -565,18 +565,25 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + months++; needpay = new Double(months * priceD).longValue(); }else{ needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } }else{ int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + if(isFirstDay(billTimeVo.getStartDate())){ + months++; + } needpay = new Double(months * priceD).longValue(); } }else if(i == billTimeVoList.size()-1){//最后 needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + if(isFirstDay(billTimeVo.getStartDate())){ + months++; + } needpay = new Double(months * priceD).longValue(); } } @@ -666,7 +673,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //按月计租 // if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) // ||propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { - result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview); + result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview); // } else { // //如果按日 // List yearList = new ArrayList<>(); @@ -932,3 +939,5 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } + + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 029fa65ba..c15ad37df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -735,7 +735,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //按月计租 // if (wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) // ||wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { - rentList = buildRentMonth(wxMerchant, userId, wxRentContract, receivePeriod, lease, rentalStartDate, price,isPreview); + rentList = buildRentMonth(wxMerchant, userId, wxRentContract, receivePeriod, lease, rentalStartDate, price,isPreview); // } else { // //如果按日 // List yearList = new ArrayList<>(); @@ -955,18 +955,25 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + months++; needpay = new Double(months * priceD).longValue(); }else{ needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } }else{ int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + if(isFirstDay(billTimeVo.getStartDate())){ + months++; + } needpay = new Double(months * priceD).longValue(); } }else if(i == billTimeVoList.size()-1){//最后 needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + if(isFirstDay(billTimeVo.getStartDate())){ + months++; + } needpay = new Double(months * priceD).longValue(); } } @@ -1806,6 +1813,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { Double total = new Double(0); int[] diff; + if(sd.format(start).equals("2019-07-01")){ + System.out.println(); + } //同一天 if(sd.format(start).equals(sd.format(end))){ int dayCount = DateUtils.getMonthDayCount(start); @@ -1987,3 +1997,5 @@ public class WxRentContractServiceImpl implements WxRentContractService { + + From 04a487d120a6d409f05bb1a7f4cc068a9fa7b704 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 3 Jun 2019 19:28:34 +0800 Subject: [PATCH 009/289] =?UTF-8?q?[=E9=A2=84=E8=A7=88=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index c15ad37df..b81e3c455 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -961,11 +961,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } }else{ - int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); if(isFirstDay(billTimeVo.getStartDate())){ - months++; + int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); + if(isFirstDay(billTimeVo.getStartDate())){ + months++; + } + needpay = new Double(months * priceD).longValue(); + }else{ + needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } - needpay = new Double(months * priceD).longValue(); } }else if(i == billTimeVoList.size()-1){//最后 needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); From 94ff4c16cbc91475dc2dae36b0a83dd7869b9f6c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 10:32:41 +0800 Subject: [PATCH 010/289] =?UTF-8?q?[=E6=99=BA=E8=83=BD=E7=94=B5=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=B5=E8=A1=A8=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=AD=89mapper.xml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/KwBoxCmdHistoryMapper.xml | 48 ++++++++++++++++++ .../resources/mapper/KwBoxMeterMapper.xml | 50 +++++++++++++++++++ .../mapper/KwMerchantMeterMapper.xml | 50 +++++++++++++++++++ .../resources/mapper/KwMeterDataMapper.xml | 48 ++++++++++++++++++ 4 files changed, 196 insertions(+) create mode 100644 mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml diff --git a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml new file mode 100644 index 000000000..08f55811c --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`imei`,`iccid`,`cmd`,`info`,`device_time`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml new file mode 100644 index 000000000..27412f3c0 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`meter_id`,`box_id`,`status`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `status` = #{status} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml new file mode 100644 index 000000000..7f929b68f --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`meter_id`,`merchant_id`,`status`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `status` = #{status} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml new file mode 100644 index 000000000..fff673c0c --- /dev/null +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`result`,`device_time`,`create_time`,`update_time` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + From 66db52e537c1bdf1cf970295cfd9de024ccc0524 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 11:43:01 +0800 Subject: [PATCH 011/289] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AELo?= =?UTF-8?q?g][=E6=96=B0=E5=A2=9E]:=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AELog?= =?UTF-8?q?=E9=87=8D=E6=95=B4=E7=90=86=EF=BC=8C=E5=8F=8Aaction=20Log?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 8 ++-- .../basic/WxMerchantShopController.java | 2 + .../controller/basic/WxTagsController.java | 1 + .../controller/car/WxParkController.java | 4 ++ .../WxPropertyContractController.java | 14 ++++++- .../contract/WxRentContractController.java | 1 + .../WxMerchantTradeDailyController.java | 1 + .../market/WxMerchantMicroPayController.java | 4 +- .../controller/market/WxOrderController.java | 1 + .../market/WxPayOrderController.java | 1 + .../WxProfitSharingOrderController.java | 1 + .../market/WxRefundOrderController.java | 1 + .../market/WxSubsidyController.java | 5 +++ .../controller/market/WxTopicController.java | 4 ++ .../mem/WxCUserBasicInfoController.java | 7 +++- .../mem/WxCreditHistoryController.java | 41 +++++++++++-------- .../mem/WxLevelConfigController.java | 6 +++ .../mem/WxUserChannelController.java | 2 + .../controller/msg/WxMsgController.java | 1 + .../controller/rent/WxBillAllController.java | 2 +- .../rent/WxBillDailyController.java | 2 +- .../rent/WxBillOtherDepositController.java | 14 +++---- .../rent/WxBillPropertyController.java | 2 +- .../controller/rent/WxBillRentController.java | 2 +- .../sys/MallUserActionController.java | 38 +++++++++++++++++ .../sys/MallUserInfoController.java | 3 +- .../controller/sys/SysMenuController.java | 9 ++-- .../controller/sys/UploadController.java | 4 ++ .../controller/sys/WechatLoginController.java | 3 ++ .../iformall/domain/po/MallPermission.java | 7 ---- 30 files changed, 140 insertions(+), 51 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 3d136b35f..c86fa0d89 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -2,8 +2,8 @@ package com.iformall.controller.app; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; -import com.alibaba.druid.support.json.JSONUtils; import com.amazonaws.services.s3.model.ObjectMetadata; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -25,7 +25,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -65,7 +64,7 @@ public class WxAppinfoController extends BaseController { ExecutorService fixedThreadPool = Executors.newFixedThreadPool(150); - @ApiOperation("加载老数据二维码") + @ApiOperation("门店二维码--二维码数据刷数据库") @GetMapping("/updateQrCode") public void updateQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)) { @@ -89,7 +88,7 @@ public class WxAppinfoController extends BaseController { } } - @ApiOperation("加载卷二维码") + @ApiOperation("券二维码--二维码数据刷数据库") @GetMapping("/updateCouponQrCode") public void updateCouponQrCode(String p)throws ServletException, IOException { if("xlldxx".equals(p)){ @@ -115,6 +114,7 @@ public class WxAppinfoController extends BaseController { @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @PostMapping("/downQrCode") + @SystemControllerLog(description = "营销物料--下载二维码") public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException { logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode"); String name = (String) params.get("name"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java index ce8672714..115701683 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java @@ -1,6 +1,7 @@ package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchantShop; @@ -27,6 +28,7 @@ public class WxMerchantShopController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "商户商铺--获取关联商铺信息") public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxMerchantShopController::queryShopList"); if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index 5e9c210ef..d6277b35c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -34,6 +34,7 @@ public class WxTagsController extends BaseController { @GetMapping("getAllList") @ApiOperation("标签弹窗接口") + @SystemControllerLog(description = "会员管理-标签获取") public ResultData getAllList() { logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList"); return new ResultData(wxTagsService.listAllVo()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java index 84b48957d..34e5ad20a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java @@ -38,6 +38,7 @@ public class WxParkController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") + @SystemControllerLog(description = "停车-新增停车场") public ResultData add(@RequestBody WxPark wxPark) { logger.debug("[" + getIpAddr() + "] WxParkController::add"); //Assert.notNull(wxPark.getName(), "角色名不能为空"); @@ -48,6 +49,7 @@ public class WxParkController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") + @SystemControllerLog(description = "停车-停车场信息更新") public ResultData update(@RequestBody WxPark wxPark) { logger.debug("[" + getIpAddr() + "] WxParkController::update"); wxParkService.saveOrUpdate(wxPark); @@ -57,6 +59,7 @@ public class WxParkController extends BaseController { @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "停车-停车场删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxParkController::delete"); wxParkService.deleteById(id); @@ -66,6 +69,7 @@ public class WxParkController extends BaseController { @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "停车-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxParkController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxParkService.getById(id)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 426bca76a..f628989e0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -6,7 +6,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.util.Map; /** @@ -39,6 +37,7 @@ public class WxPropertyContractController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "物业合同-列表") public ResultData list(@ModelAttribute WxPropertyContract wxPropertyContract, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::list"); if (null == wxPropertyContract) { @@ -50,6 +49,7 @@ public class WxPropertyContractController extends BaseController { } @PostMapping("add") + @SystemControllerLog(description = "物业合同-新增") public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); MallUserInfo user = getUser(); @@ -59,6 +59,7 @@ public class WxPropertyContractController extends BaseController { } @PostMapping("update") + @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); MallUserInfo user = getUser(); @@ -69,6 +70,7 @@ public class WxPropertyContractController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::delete"); wxPropertyContractService.deleteById(id); @@ -77,6 +79,7 @@ public class WxPropertyContractController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-根据ID查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById"); WxBillProperty wxBillProperty = new WxBillProperty(); @@ -86,12 +89,14 @@ public class WxPropertyContractController extends BaseController { } @RequestMapping("/download") + @SystemControllerLog(description = "物业合同-下载") public void download(HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::download"); wxPropertyContractService.download(request, response, getTenantId()); } @GetMapping("/getPropertyContractStatusInfo") + @SystemControllerLog(description = "物业合同-状态信息") public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo"); wxPropertyContract.setTenantId(getTenantId()); @@ -100,12 +105,14 @@ public class WxPropertyContractController extends BaseController { @GetMapping("/endPropertyContract") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-终止") public ResultData endRentContract(Long id) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endRentContract"); return wxPropertyContractService.endRentContract(id); } @GetMapping("/getRentContractList") + @SystemControllerLog(description = "物业合同-查询列表") public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList"); wxPropertyContract.setTenantId(getTenantId()); @@ -114,6 +121,7 @@ public class WxPropertyContractController extends BaseController { @GetMapping("/endPropertyContractByRentContractId") @ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-根据租赁合同终止") public ResultData endPropertyContractByRentContractId(Long rentContractId) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endPropertyContractByRentContractId"); return wxPropertyContractService.endPropertyContractByRentContractId(rentContractId); @@ -121,6 +129,7 @@ public class WxPropertyContractController extends BaseController { @GetMapping("/hasRentContract") @ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-是否存在相关的租赁合同") public ResultData hasRentContract(Long rentContractId) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::hasRentContract"); return wxPropertyContractService.hasRentContract(rentContractId); @@ -128,6 +137,7 @@ public class WxPropertyContractController extends BaseController { @GetMapping("updatePropertyContractStatus") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "物业合同-更新合同状态") public ResultData updatePropertyContractStatus(Long id) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); return wxPropertyContractService.updatePropertyContractStatus(id); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 093282474..dcabe1272 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -147,6 +147,7 @@ public class WxRentContractController extends BaseController { } @RequestMapping("/download") + @SystemControllerLog(description = "租赁合同-下载") public void download(HttpServletRequest request, HttpServletResponse response){ logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); wxRentContractService.download(request,response,getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index bf95ef510..d7e015ad3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -37,6 +37,7 @@ public class WxMerchantTradeDailyController extends BaseController { @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") @GetMapping("/getVolume") + @SystemControllerLog(description = "解单-获得指定日期的解单") public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { wxMerchantTradeDaily.setTenantId(getTenantId()); return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 9d9e785b1..adab71275 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -28,7 +28,7 @@ public class WxMerchantMicroPayController extends BaseController { @ApiOperation("获得商场近30日刷卡") @GetMapping("/listMonth") - @SystemControllerLog(description = "收银台-近30日") + @SystemControllerLog(description = "收银台-近30日刷卡列表") public ResultData listMonth() { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth"); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); @@ -41,7 +41,7 @@ public class WxMerchantMicroPayController extends BaseController { @ApiOperation("获商户得近30日刷卡") @GetMapping("/detail") - @SystemControllerLog(description = "收银台-近30日刷卡") + @SystemControllerLog(description = "收银台-近30日刷卡列表详情") public ResultData detail(@RequestParam Long merchantId) { logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail"); WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 94f650aed..f43aab28e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -138,6 +138,7 @@ public class WxOrderController extends BaseController { @ApiOperation(value = "积分兑换订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") @PostMapping("save") + @SystemControllerLog(description = "订单管理-积分兑换订单") public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) { logger.info("OrderSave: " + orderSaveDto); if (orderSaveDto.getCouponChannelId() == null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 1d4b3f80d..6709a9183 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -90,6 +90,7 @@ public class WxPayOrderController extends BaseController { @ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") @PostMapping("/updatePayOrder") + @SystemControllerLog(description = "支付订单-更新支付订单状态") public ResultData updatePayOrder(@RequestBody Map paramMap) { logger.info("/api/pay/updatePayOrder" + paramMap.toString()); String payOrderIdStr = (String) paramMap.get("payOrderId"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 4b3ac8cc4..702af060a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -61,6 +61,7 @@ public class WxProfitSharingOrderController extends BaseController { @ApiOperation("分账详情") @GetMapping("findOrderDetails") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "分账订单-分账详情") public ResultData findOrderDetails(Long id) { logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::findOrderDetails"); return wxProfitSharingOrderService.findOrderDetails(id); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java index 64bd560e6..5fd66d5a2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java @@ -64,6 +64,7 @@ public class WxRefundOrderController extends BaseController { @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "退款-根据id删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxRefundOrderController::delete"); wxRefundOrderService.deleteById(id); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java index f28cad4a4..aa030176f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java @@ -39,6 +39,7 @@ public class WxSubsidyController extends BaseController { @GetMapping("prePay") @ApiImplicitParams({ @ApiImplicitParam(name = "amount", value = "金额", dataType = "String", paramType = "query", required = true)}) + @SystemControllerLog(description = "商城补贴-补贴扫码支付发起") public void subsidyPrepay(String amount, HttpServletResponse response) throws Exception { String ipStr = getIpAddr(); logger.info("subsidyPrepay: " + ipStr + "-" + amount); @@ -72,6 +73,7 @@ public class WxSubsidyController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") + @SystemControllerLog(description = "商城补贴-新增接口") public ResultData add(@RequestBody WxSubsidy wxSubsidy) { //Assert.notNull(wxSubsidy.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); @@ -81,6 +83,7 @@ public class WxSubsidyController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") + @SystemControllerLog(description = "商城补贴-更新") public ResultData update(@RequestBody WxSubsidy wxSubsidy) { wxSubsidyService.saveOrUpdate(wxSubsidy); return new ResultData(); @@ -89,6 +92,7 @@ public class WxSubsidyController extends BaseController { @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "商城补贴-删除") public ResultData delete(Long id) { wxSubsidyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); @@ -97,6 +101,7 @@ public class WxSubsidyController extends BaseController { @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "商城补贴-查询") public ResultData findById(Long id) { return new ResultData(Result.SUCCESS, "查询成功", wxSubsidyService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index 9b2f05cc3..bd38f62d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -1,6 +1,7 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; @@ -27,6 +28,7 @@ public class WxTopicController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "专题-列表") public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxTopicController::list"); String tenantId = getTenantId(); @@ -47,6 +49,7 @@ public class WxTopicController extends BaseController { } @GetMapping("findById") + @SystemControllerLog(description = "专题-获取详情") public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); String tenantId = getTenantId(); @@ -56,6 +59,7 @@ public class WxTopicController extends BaseController { } @PostMapping("saveOrUpdate") + @SystemControllerLog(description = "专题-保存更新") public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); wxTopic.setTenantId(super.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index ac5fc5d8e..e32e5b7f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -460,7 +460,7 @@ public class WxCUserBasicInfoController extends BaseController { @ApiOperation("根据手机号查询接口") @GetMapping("/findByPhone") @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) - @SystemControllerLog(description = "根据手机号查询接口") + @SystemControllerLog(description = "会员管理-根据手机号查询接口") public ResultData findByPhone(String phone) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone"); List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); @@ -473,14 +473,16 @@ public class WxCUserBasicInfoController extends BaseController { @ApiOperation("获取会员过滤器") @GetMapping("/listFilter") + @SystemControllerLog(description = "会员管理-获取会员过滤器") public ResultData listFilter() { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); return new ResultData(wxCUserBasicInfoService.listFilters(getTenantId())); } - @ApiOperation("获取会员过滤器") + @ApiOperation("会员过滤器获取数量") @PostMapping("/countByFilter") + @SystemControllerLog(description = "会员管理-会员过滤器获取数量") public ResultData countByFilter(@RequestBody List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantId(),filterList)); @@ -488,6 +490,7 @@ public class WxCUserBasicInfoController extends BaseController { @ApiOperation("获取会员过滤器") @PostMapping("/listByFilter") + @SystemControllerLog(description = "会员管理-会员过滤器获取") public ResultData listByFilter(@RequestParam List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 57d922127..7e254744f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -1,6 +1,7 @@ package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -19,18 +20,18 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxCreditHistory") -public class WxCreditHistoryController extends BaseController -{ - @Autowired +public class WxCreditHistoryController extends BaseController { + @Autowired private WxCreditHistoryService wxCreditHistoryService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "积分历史-列表") public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); @@ -41,15 +42,17 @@ public class WxCreditHistoryController extends BaseController @ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值") @GetMapping("findByMerchantIdAndSpend") @ApiImplicitParams({ - @ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true), - @ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)}) + @ApiImplicitParam(name = "merchantId", value = "商户ID", dataType = "long", paramType = "query", required = true), + @ApiImplicitParam(name = "spend", value = "消费金额", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "积分历史-根据商户ID和消费金额获取所增加积分") public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); - return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId())); + return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, getTenantId())); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") + @SystemControllerLog(description = "积分历史-新增接口") public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); MallUserInfo user = getUser(); @@ -64,19 +67,21 @@ public class WxCreditHistoryController extends BaseController } } - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "积分历史-查询") public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); - return new ResultData(Result.SUCCESS,"查询成功",wxCreditHistoryService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); + return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id)); } /** * 根据A端设置的【每自然年末扣除前N年用户积分】规则,扣减用户积分 + * * @return */ - public ResultData clearCreditByYear(){ + public ResultData clearCreditByYear() { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear"); wxCreditHistoryService.clearCreditByYear(); return new ResultData(Result.SUCCESS); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 83cb937b3..44ee9f9ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -1,5 +1,6 @@ package com.iformall.controller.mem; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.controller.base.BaseController; import org.slf4j.Logger; @@ -39,6 +40,7 @@ public class WxLevelConfigController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "会员等级权益-列表") public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); @@ -50,6 +52,7 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") + @SystemControllerLog(description = "会员等级权益-新增") public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); String tenantId = getTenantId(); @@ -64,6 +67,7 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("更改会员权益") @PostMapping("updateCapabilities") + @SystemControllerLog(description = "会员等级权益-更改会员权益") public ResultData updateCapabilities(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); String tenantId = getTenantId(); @@ -78,6 +82,7 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("根据id删除接口") @PostMapping("/del") + @SystemControllerLog(description = "会员等级权益-删除") public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); wxLevelConfigService.deleteById(wxLevelConfig.getId()); @@ -87,6 +92,7 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "会员等级权益-获取") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxLevelConfigService.getById(id)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java index fc8e0a255..12ae8b7d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java @@ -1,6 +1,7 @@ package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -26,6 +27,7 @@ public class WxUserChannelController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "会员等级权益-更改会员权益") public ResultData list(@ModelAttribute WxUserChannel wxUserChannel, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxUserChannelController::list"); if (null == wxUserChannel) wxUserChannel = new WxUserChannel(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index e6268efe5..40e6cd6ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -84,6 +84,7 @@ public class WxMsgController extends BaseController { @RequestMapping("/excleupload") + @SystemControllerLog(description = "标签短信-导出") public ResultData excleupload(@RequestParam("file") MultipartFile file) { logger.debug("[" + getIpAddr() + "] WxMsgController::excleupload"); if (file.isEmpty()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 14c542042..ff17018cb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -134,7 +134,7 @@ public class WxBillAllController extends BaseController { @GetMapping("exportOweBill") - @SystemControllerLog(description = "生成催缴单") + @SystemControllerLog(description = "费用收缴数据-生成催缴单") public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); if (null == wxBillAll) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 5efbffd38..f50c120b8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -121,7 +121,7 @@ public class WxBillDailyController extends BaseController { } @PostMapping(value = "/importTemplate", consumes = "multipart/*") - @SystemControllerLog(description = "会员管理-导入数据") + @SystemControllerLog(description = "日常账单-导入数据") public ResultData importTemplate(@RequestParam("file") MultipartFile mFile) { logger.debug("[" + getIpAddr() + "] wxBillDailyService::importTemplate"); if (mFile.isEmpty()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index bf2ec3cec..3b5d0c929 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -44,7 +44,7 @@ public class WxBillOtherDepositController extends BaseController { } @PostMapping("add") - @SystemControllerLog(description = "其它账单-新增") + @SystemControllerLog(description = "其它押金账单-新增") public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add"); MallUserInfo user = getUser(); @@ -54,7 +54,7 @@ public class WxBillOtherDepositController extends BaseController { } @PostMapping("update") - @SystemControllerLog(description = "其它账单-更新") + @SystemControllerLog(description = "其它押金账单-更新") public ResultData update(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::update"); MallUserInfo user = getUser(); @@ -64,7 +64,7 @@ public class WxBillOtherDepositController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "其它账单-删除") + @SystemControllerLog(description = "其它押金账单-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::delete"); wxBillOtherDepositService.deleteById(id); @@ -73,7 +73,7 @@ public class WxBillOtherDepositController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "其它账单-查询") + @SystemControllerLog(description = "其它押金账单-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxBillOtherDepositService.getById(id)); @@ -81,14 +81,14 @@ public class WxBillOtherDepositController extends BaseController { @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "其它账单-支付更新") + @SystemControllerLog(description = "其它押金账单-支付更新") public ResultData updatePaid(Long id) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::updatePaid"); return wxBillOtherDepositService.updatePaid(id); } @PostMapping("returnDeposit") - @SystemControllerLog(description = "其它账单-退回押金") + @SystemControllerLog(description = "其它押金账单-退回押金") public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit"); return wxBillOtherDepositService.returnDeposit(wxBillDeposit, getUser()); @@ -96,7 +96,7 @@ public class WxBillOtherDepositController extends BaseController { } @PostMapping("adjustDeposit") - @SystemControllerLog(description = "其它账单-调整押金") + @SystemControllerLog(description = "其它押金账单-调整押金") public ResultData adjustDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::adjustDeposit"); return wxBillOtherDepositService.adjustDeposit(wxBillDeposit); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 1d23ffa52..b1338e79e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -107,7 +107,7 @@ public class WxBillPropertyController extends BaseController { @PostMapping("updateLatePayStatus") - @SystemControllerLog(description = "租赁账单-滞纳金结单") + @SystemControllerLog(description = "物业账单-滞纳金结单") public ResultData updateLatePayStatus(@RequestBody WxBillProperty wxBillProperty) { logger.debug("[" + getIpAddr() + "] WxBillPropertyController::updateLatePayStatus"); return wxBillPropertyService.updateLatePayStatus(wxBillProperty); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 7fe9430ba..1b32eb3ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -112,7 +112,7 @@ public class WxBillRentController extends BaseController { @PostMapping("updateLatePayStatus") - @SystemControllerLog(description = "租赁账单-滞纳金结单") + @SystemControllerLog(description = "租赁押金账单-滞纳金结单") public ResultData updateLatePayStatus(@RequestBody WxBillRent wxBillRent) { logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayStatus"); return wxBillRentService.updateLatePayStatus(wxBillRent); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java new file mode 100644 index 000000000..d287641af --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -0,0 +1,38 @@ +package com.iformall.controller.sys; + +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.MallUserAction; +import com.iformall.service.MallUserActionService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("mallUserAction") +public class MallUserActionController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private MallUserActionService mallUserActionService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "用户管理-用户访问Log列表") + public ResultData list(@ModelAttribute MallUserAction userAction, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MallUserActionController::list"); + if (null == userAction) userAction = new MallUserAction(); + final PageInfo page = mallUserActionService.listAsPage(userAction, pageNum, pageSize); + return new ResultData(page); + } + + +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 084a905bd..e4ccda9e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -294,7 +294,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户权限检查") @GetMapping("getUser") //@RequiresPermissions("sys:user:info") - //@SystemControllerLog(description = "用户管理-用户信息") + @SystemControllerLog(description = "用户管理-获取用户信息") public ResultData getUserInfo() { ///logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); MallUserInfo info = getUser(); @@ -337,6 +337,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "修改密码", notes = "{\"userName\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}") @PostMapping("/updatepwd") + @SystemControllerLog(description = "用户管理-修改密码") public ResultData updatepwd(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::updatepwd"); // String phone,String code,String pwd diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index da8218665..b9d0ce606 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -52,6 +52,7 @@ public class SysMenuController extends BaseController { @ApiOperation("导航菜单") @GetMapping("/nav") + @SystemControllerLog(description = "菜单-导航菜单") public ResultData nav(){ logger.debug("[" + getIpAddr() + "] MallPermissionController::nav"); MallUserInfo user = getUser(); @@ -66,7 +67,7 @@ public class SysMenuController extends BaseController { @ApiOperation("所有菜单列表") @GetMapping("list") //@RequiresPermissions("sys:menu:list") - @SystemControllerLog(description = "用户管理-权限") + @SystemControllerLog(description = "菜单-所有菜单列表") public ResultData getList() { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); @@ -81,7 +82,7 @@ public class SysMenuController extends BaseController { @ApiOperation("菜单信息") @GetMapping("/findById") //@RequiresPermissions("sys:menu:info") - @SystemControllerLog(description = "用户管理-权限查找") + @SystemControllerLog(description = "菜单-权限查找") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] MallPermissionController::findById"); return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getById(id)); @@ -90,7 +91,7 @@ public class SysMenuController extends BaseController { @ApiOperation("获取父子菜单ID信息") @GetMapping("/getMenuIdsById") //@RequiresPermissions("sys:menu:info") - @SystemControllerLog(description = "用户管理-父子菜单查找") + @SystemControllerLog(description = "菜单-父子菜单查找") public ResultData getMenuIdsById(Long parentId) { logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById"); MallUserInfo user = getUser(); @@ -100,7 +101,7 @@ public class SysMenuController extends BaseController { @ApiOperation("获取父子菜单信息") @GetMapping("/getMenusById") //@RequiresPermissions("sys:menu:info") - @SystemControllerLog(description = "用户管理-父子菜单查找") + @SystemControllerLog(description = "菜单-父子菜单查找") public ResultData getMenusById(Long parentId) { logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById"); MallUserInfo user = getUser(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 6244707e4..435787946 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -9,6 +9,7 @@ import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.*; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.controller.base.BaseController; @@ -125,6 +126,7 @@ public class UploadController extends BaseController { */ @PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传文件") + @SystemControllerLog(description = "文件上传") public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); @@ -159,6 +161,7 @@ public class UploadController extends BaseController { */ @PostMapping(value = "/awsImgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传图片") + @SystemControllerLog(description = "上传图片") public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); @@ -222,6 +225,7 @@ public class UploadController extends BaseController { */ @PostMapping(value = "/awsFilesUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("多文件上传") + @SystemControllerLog(description = "多文件上传") public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 6ab138a15..bbf3a1957 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -1,6 +1,7 @@ package com.iformall.controller.sys; import com.alibaba.fastjson.JSON; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -322,6 +323,7 @@ public class WechatLoginController extends BaseController { @ApiOperation(value = "微信第三方登录绑定", notes = "请配置此callback到网页redirect_uri") @GetMapping("bindWebOpenId") + @SystemControllerLog(description = "微信第三方登录绑定") public void userBindWebOpenId(String code, String state, HttpServletRequest request, HttpServletResponse response) { log.debug("[" + getIpAddr() + "] WechatLoginController::bindWebOpenId"); String host = request.getHeader("host"); @@ -368,6 +370,7 @@ public class WechatLoginController extends BaseController { @ApiOperation(value = "微信第三方登录解绑", notes = "请配置此callback到网页redirect_uri") @GetMapping("cleanWebOpenId") + @SystemControllerLog(description = "微信第三方登录解绑") public ResultData cleanWebOpenId(@ModelAttribute MallUserInfo userInfo) { log.debug("[" + getIpAddr() + "] WechatLoginController::cleanWebOpenId"); MallUserInfo user = getUser(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 9a39a7a07..730dceacc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -12,13 +12,6 @@ import java.io.Serializable; @Data public class MallPermission implements Serializable { private static final long serialVersionUID = 1L; - - // left - // id, name, parentId, moduleColor, moduleColorNum, 标准版 class - // childs - // name, link, id, icon - // - @Id protected Long id; From 85259fd1c32ac5d1a1e1ff9d263132f0796bfcbf Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 13:18:48 +0800 Subject: [PATCH 012/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=88=9B=E5=BB=BA=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906041320__ADD_ACTIVITY_TABLE.sql | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql new file mode 100644 index 000000000..4396e7a98 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql @@ -0,0 +1,22 @@ +drop table if exists `wx_activity`; +CREATE TABLE IF NOT EXISTS `wx_activity` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `cover_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '封面图', + `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动名称', + `sub_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '副标题', + `detail` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '活动正文', + `html` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '富文本', + `person_limit` int(11) NOT NULL COMMENT '报名人数', + `activity_time` datetime NOT NULL COMMENT '活动时间', + `useCredit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', + `credit` int(11) DEFAULT 0 COMMENT '消耗积分', + `type` smallint(2) NOT NULL COMMENT '类型 1固定格式2自由图文', + `status` smallint(2) NOT NULL COMMENT '状态0上线 1下线', + `start_time` datetime NOT NULL COMMENT '活动开始显示时间', + `end_time` datetime NOT NULL COMMENT '活动结束显示时间', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动表' CHECKSUM=0 DELAY_KEY_WRITE=0; \ No newline at end of file From b15f8632b2159375525fb36003d8e9eb58c07ae3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 13:25:34 +0800 Subject: [PATCH 013/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql index 4396e7a98..0e07bd7ed 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql @@ -1,7 +1,7 @@ drop table if exists `wx_activity`; CREATE TABLE IF NOT EXISTS `wx_activity` ( `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', `cover_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '封面图', `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动名称', `sub_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '副标题', From db88857e494cd228390d9e7ed3d31648e5fb0ea9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 13:27:38 +0800 Subject: [PATCH 014/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql index 0e07bd7ed..a0caaad75 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS `wx_activity` ( `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动名称', `sub_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '副标题', `detail` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '活动正文', - `html` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '富文本', + `html` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '富文本', `person_limit` int(11) NOT NULL COMMENT '报名人数', `activity_time` datetime NOT NULL COMMENT '活动时间', `useCredit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', From 66d4805ab5d8187e9d0e73de411de21ada9102e3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 13:29:33 +0800 Subject: [PATCH 015/289] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=B0=83=E6=95=B4=E5=AE=A1=E6=89=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906041033__L_ALTER_MSG.sql | 28 +++++++++++++++++++ .../domain/po/WxPropertyContract.java | 5 ++++ .../iformall/domain/po/WxRentContract.java | 4 +++ 3 files changed, 37 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql new file mode 100644 index 000000000..71c78c57c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql @@ -0,0 +1,28 @@ +update wx_msg_validationcode_model set content = ' + + + + + + + + + + 富茂审批邮件 + + + + + +
+
+ +
+
+
审批通过通知
+
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
+
+
+ + +' where name = '审批通过通知'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 6794002c7..ef522ab1d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -176,6 +176,11 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") private String subjectName; + + @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") + @Transient + private Integer rentStartType; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 0f4b0835d..f75eaf79a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -217,6 +217,10 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") private String subjectName; + @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") + @Transient + private Integer rentStartType; + // public Integer getAdjustPeriod() { // if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ // return EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode(); From a07e94563c8be85eda2c55733c376338efbae3d8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 13:38:09 +0800 Subject: [PATCH 016/289] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=B0=83=E6=95=B4=E5=AE=A1=E6=89=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1906041033__L_ALTER_MSG.sql => V201906041338__L_ALTER_MSG.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201906041033__L_ALTER_MSG.sql => V201906041338__L_ALTER_MSG.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041338__L_ALTER_MSG.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201906041033__L_ALTER_MSG.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906041338__L_ALTER_MSG.sql From ead067c97b91e17571ef19489a49807924b00098 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 13:41:34 +0800 Subject: [PATCH 017/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=AE=9E=E4=BD=93=E7=B1=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxActivity.java | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java new file mode 100644 index 000000000..451df0ba8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -0,0 +1,138 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_activity") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxActivity extends BaseEntity { + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") + private String tenantId; + @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") + private String coverImg; + @io.swagger.annotations.ApiModelProperty(value = "主标题", name = "title") + private String title; + @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "subTitle") + private String subTitle; + @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") + private Integer useCredit; + @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") + private Integer credit; + @io.swagger.annotations.ApiModelProperty(value = "活动人数", name = "personLimit") + private Integer personLimit; + @io.swagger.annotations.ApiModelProperty(value = "活动正文", name = "detail") + private String detail; + @io.swagger.annotations.ApiModelProperty(value = "活动开始显示时间", name = "startTime") + private Date startTime; + @io.swagger.annotations.ApiModelProperty(value = "活动结束显示时间", name = "endTime") + private Date endTime; + @io.swagger.annotations.ApiModelProperty(value = "类型 1固定格式2自由图文", name = "type") + private Integer type; + @io.swagger.annotations.ApiModelProperty(value = "0上线 1下线", name = "status") + private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") + private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "富文本", name = "html") + private String html; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "小程序路径", name = "weappPath") + protected String weappPath; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "小程序二维码Scene", name = "weappScene") + protected String weappScene; + + public String getWeappPath() { + if (type == null) + return "pages/index/index"; + return "pages/index/index?type=bd&bt=" + type + "&id=" + id; + } + + public String getWeappScene() { + if (type == null) + return ""; + return "t:bd:" + type + ":" + id; + } + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_time` ASC"), ActivityTime_DESC("`activity_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(WxActivity.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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + 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)); + } + } +} From 053b62a82f731ffad764db38743eee5c5868e837 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 14:49:34 +0800 Subject: [PATCH 018/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906041430__ALTER_CAMPAIGN.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql new file mode 100644 index 000000000..49d34b0bb --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql @@ -0,0 +1,8 @@ +alter table wx_campaign +add column `person_limit` int(11) DEFAULT 0 COMMENT '报名人数', +add column `activity_time` datetime COMMENT '活动时间', +add column `use_credit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', +add column `credit` int(11) DEFAULT 0 COMMENT '消耗积分', +add column `question` json NOT NULL COMMENT '问题', +add column `is_expired` smallint(2) DEFAULT 0 COMMENT '是否过期1是0否', +add column `activity_type` smallint(2) DEFAULT 1 COMMENT '活动类型1直接投放2限时投放'; From 7101abf8570756673c40819360d807d393835f85 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 14:59:48 +0800 Subject: [PATCH 019/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][sql=E5=8F=8A=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906041430__ALTER_CAMPAIGN.sql | 2 +- .../java/com/iformall/domain/po/WxCampaign.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql index 49d34b0bb..1569c109c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql @@ -4,5 +4,5 @@ add column `activity_time` datetime COMMENT '活动时间', add column `use_credit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', add column `credit` int(11) DEFAULT 0 COMMENT '消耗积分', add column `question` json NOT NULL COMMENT '问题', -add column `is_expired` smallint(2) DEFAULT 0 COMMENT '是否过期1是0否', +add column `is_expired` smallint(2) DEFAULT 1 COMMENT '是否过期1是0否', add column `activity_type` smallint(2) DEFAULT 1 COMMENT '活动类型1直接投放2限时投放'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 3e2f96bf7..613980c68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -8,7 +8,6 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -75,6 +74,21 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") private String html; + @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") + private Integer personLimit; + @io.swagger.annotations.ApiModelProperty(value = "活动时间", name = "activityTime") + private Date activityTime; + @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") + private Integer useCredit; + @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") + private Integer credit; + @io.swagger.annotations.ApiModelProperty(value = "问题", name = "question") + private String question; + @io.swagger.annotations.ApiModelProperty(value = "是否过期1是0否", name = "isExpired") + private Integer isExpired; + @io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType") + private Integer activityType; + @Transient @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") protected String weappPath; From 962126eae48114f135b55b35aab2ff860e7b39d0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:01:00 +0800 Subject: [PATCH 020/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 21 ++++++++++ .../contract/WxRentContractController.java | 35 ++++++++++++++++- .../com/iformall/enums/EnumRentStartType.java | 38 +++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index f628989e0..69c5861c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,6 +7,9 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumRentStartType; +import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; import io.swagger.annotations.ApiImplicitParam; @@ -30,6 +33,8 @@ public class WxPropertyContractController extends BaseController { private WxPropertyContractService wxPropertyContractService; @Autowired private WxBillPropertyService wxBillPropertyService; + @Autowired + private WxPropertyContractMapper wxPropertyContractMapper; private Logger logger = LoggerFactory.getLogger(WxPropertyContractController.class); @@ -58,6 +63,22 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); } + @PostMapping("updateRentStartTime") + @SystemControllerLog(description = "物业合同-更新租赁开始日期") + public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); + Integer rentStartType = wxPropertyContract.getRentStartType(); + wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); + } + MallUserInfo user = getUser(); + wxPropertyContract.setTenantId(user.getTenantId()); + wxPropertyContract.setAdjustPeriodHandle(); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + } + + @PostMapping("update") @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index dcabe1272..d1c8bc890 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -12,6 +12,8 @@ import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumRentStartType; +import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxBillRentService; import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxRentContractService; @@ -46,6 +48,8 @@ public class WxRentContractController extends BaseController { private WxPayAccountBillService payAccountBillService; @Autowired private WxShopService wxShopService; + @Autowired + private WxRentContractMapper wxRentContractMapper; @GetMapping("getDateDiff") @ApiImplicitParams({ @@ -85,9 +89,28 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); } + @PostMapping("updateRentStartTime") + @SystemControllerLog(description = "租赁合同-更新租赁开始日期") + public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); + Integer rentStartType = wxRentContract.getRentStartType(); + wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + wxRentContract.setRentPriceHandle(); + return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); + } + @PostMapping("update") @SystemControllerLog(description = "租赁合同-更新") public ResultData update(@RequestBody WxRentContract wxRentContract) { @@ -96,6 +119,9 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); } @@ -112,6 +138,10 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); } @@ -123,6 +153,9 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); } @@ -147,7 +180,6 @@ public class WxRentContractController extends BaseController { } @RequestMapping("/download") - @SystemControllerLog(description = "租赁合同-下载") public void download(HttpServletRequest request, HttpServletResponse response){ logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); wxRentContractService.download(request,response,getTenantId()); @@ -263,3 +295,4 @@ public class WxRentContractController extends BaseController { } + diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java new file mode 100644 index 000000000..31bbe55d7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumRentStartType { + + + STARTTIME(2, "记租开始日期"), + RENTTIME(1, "租赁开始日期"), + ; + + public static EnumRentStartType getEnum(Integer code) { + for (EnumRentStartType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumRentStartType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} + From 9e07211aee567628ddc9b206690b6e5bab3b5564 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 15:09:55 +0800 Subject: [PATCH 021/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906041506__ADD_MENU.sql | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql new file mode 100644 index 000000000..b448fab20 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql @@ -0,0 +1,31 @@ +INSERT INTO `mall_permission` + (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) +VALUES + (663, '活动报名', 604, 'Y', null, 1, null, null, 'regActivityList', null, 0, 663); + + +DROP TABLE IF EXISTS `mall_sale_type` ; +CREATE TABLE `mall_sale_type` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '销售类型', + `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', + `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', + `menus` json DEFAULT NULL COMMENT '菜单列表', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_sale_type` + (`id`,`name`, `type`, `period`, `menus`) +VALUES + (1, '尊享全能版', 1, 12, + '[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' + ), + (2, '尊享营销版', 2, 12, + '[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' + ), + (3, '速享版', 3, 1, + '[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]' + ) + + ; \ No newline at end of file From 5628dd01199a6b8798263483df735de42397776f Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:13:40 +0800 Subject: [PATCH 022/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 2 +- .../controller/contract/WxRentContractController.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 69c5861c0..4d414ea4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -69,7 +69,7 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); Integer rentStartType = wxPropertyContract.getRentStartType(); wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } MallUserInfo user = getUser(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index d1c8bc890..696ed660b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -87,9 +87,8 @@ public class WxRentContractController extends BaseController { MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); @@ -101,7 +100,7 @@ public class WxRentContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); Integer rentStartType = wxRentContract.getRentStartType(); wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); - if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } MallUserInfo user = getUser(); @@ -119,7 +118,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); @@ -139,7 +138,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); @@ -153,7 +152,7 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); From d94331f82ca27850809c3c63f16b449bc7ec1135 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 4 Jun 2019 15:14:01 +0800 Subject: [PATCH 023/289] =?UTF-8?q?[flyway][=E4=BF=AE=E6=94=B9]:=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8A=E4=B8=80=E7=89=88=E7=9A=84sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905061341__L_VAL_MSG_MODEL.sql | 4 - .../V201905061350__ADD_COLUMN_ACTIVE_TIME.sql | 4 - .../V201905061425__L_VAL_MSG_MODEL_DATA.sql | 78 --------- ...201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql | 2 - .../V201905061550__MERCHANT_UPDATE.sql | 1 - .../V201905061616__MODIFY_SCORE_RULES.sql | 1 - .../migration/V201905071520__CHANGE_MALL.sql | 4 - ...201905081200__UPDATE_SHARIING_RECEIVER.sql | 1 - .../V201905081900__UPDATE_MSG_MODEL.sql | 102 ------------ ...201905081901__UPDATE_SHARIING_RECEIVER.sql | 5 - .../V201905082030__ADD_COLUMN_PLATENUMBER.sql | 4 - .../V201905091750__CHANGE_COUPON_CHANNEL.sql | 2 - ...V201905091758__L_UPDATE_COUPON_CHANNEL.sql | 4 - .../V201905101050__UPDATE_MSG_MODEL.sql | 24 --- .../migration/V201905131552__S3_IMG_TABLE.sql | 9 - .../db/migration/V201905131644__L_TRADE.sql | 5 - .../migration/V201905131843__UPDATE_TAGS.sql | 9 - .../V201905151408__L_ALTER_MERCHANT.sql | 2 - .../migration/V201905161611__UPATE_BILL.sql | 2 - ...01905161621__ADD_MERCHANT_INTRODUCTION.sql | 2 - .../V201905171131__ADD_SALE_TYPE.sql | 25 --- .../V201905171447__ADD_COUPON_COVER_IMG.sql | 7 - ...1905171614__ADD_CAMPAIGN_COVER_PICTURE.sql | 7 - ...V201905171621__ADD_TOPIC_COVER_PICTURE.sql | 7 - .../migration/V201905171800__L_ALTER_MSG.sql | 1 - .../V201905181020__CHANGE_PERMISSION.sql | 155 ------------------ .../V201905191020__CHANGE_TEMPLATE_MSG.sql | 2 - .../V201905201046__UPDATE_TEMPLATE_MSG.sql | 17 -- .../migration/V201905201108__L_ALTER_RENT.sql | 5 - .../V201905201349__ADD_COUPON_DETAIL_IMG.sql | 7 - ...905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql | 7 - ...201905201351__ADD_TOPIC_DETAIL_PICTURE.sql | 7 - .../migration/V201905211335__L_ALTER_RENT.sql | 1 - .../migration/V201905211601__L_ALTER_RENT.sql | 5 - .../V201905231016__ADD_MERCHANT_ACTION.sql | 2 - .../migration/V201905231052__L_ALTER_RENT.sql | 2 - ...V201905251112__ADD_INDEX_FOR_MALL_USER.sql | 2 - .../migration/V201905251514__L_ALTER_RENT.sql | 2 - .../migration/V201905271447__L_ALTER_MSG.sql | 1 - ...201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql | 2 - .../V201905291742___RENT_CONTRACT.sql | 2 - .../V201905301150___MERCHANT_UPDATE.sql | 1 - .../V201905301325___UPDATE_MENU_ICON.sql | 3 - .../V201905301346__ADD_SYS_MONITOR.sql | 53 ------ .../V201905301400___PROPERTY_CONTRACT.sql | 2 - 45 files changed, 590 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql deleted file mode 100644 index 427b6e817..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql +++ /dev/null @@ -1,4 +0,0 @@ -alter table `wx_msg_validationcode_model` modify column content text; - -ALTER TABLE `wx_msg_validationcode_model` -ADD COLUMN `email_bg_img` varchar(300) DEFAULT NULL COMMENT '邮箱背景图片'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql deleted file mode 100644 index 8a8f99028..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE wx_c_user - ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间'; -ALTER TABLE wx_c_user_basic_info - ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql deleted file mode 100644 index 6d990f8ef..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql +++ /dev/null @@ -1,78 +0,0 @@ -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10,'789', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '789', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '789', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '789', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '789', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'http://202.165.179.86:8081/images/WechatIMG5130.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '789', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'http://202.165.179.86:8081/images/WechatIMG5130.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1001', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1001', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1001', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1001', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1001', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1001', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1002', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1002', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1002', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1002', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1002', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1002', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1003', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1003', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1003', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1003', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1003', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1003', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1004', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1004', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1004', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1004', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1004', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1004', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1005', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1005', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1005', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1005', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1005', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1005', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'); - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1006', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1006', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1006', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1006', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1006', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1006', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'); - - -INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`) -VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1007', '审批通过通知', '富茂', '富茂审批邮件
审批通过通知
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1007', '待缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待缴账单通知
\n
您当前的待缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1007', '审批通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n
\n
审批通知
\n
{userName}同意编号{contract}的{bustype}审批,已呈送{toUserName},请登录{page}查看审批进度
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1007', '欠缴账单通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
欠缴账单通知
\n
您当前的欠缴账单为{price}元,截止日期为{date}请登录您的商户端小程序查看账单并缴费
\n
\n
\n
\n 租金账单\n
\n
账单类型
\n
账单金额(元)
\n
缴费时间
\n
逾期天数
\n
\n {billList}\n
\n
\n
\n
遇到问题?
\n
\n 请联系商管负责人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1007', '待办通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
待办通知
\n
{name}提交了一个{bustype}待您审批,电脑登录{page}查看您的待办
\n
\n
\n
\n
申请时间:
\n
{applyTime}
\n
\n
\n
申请进度:
\n
\n \n {taskList}\n
\n
\n
\n
\n
遇到问题?
\n
\n 请联系申请人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1007', '驳回通知', '富茂', '\n\n\n\n \n \n \n \n \n \n 富茂审批邮件\n \n \n\n\n\n
\n
\n \n
\n \n
\n
审批通过通知
\n
编号{contract}的{bustype}审批被驳回,请登录{page}查看审批明细
\n
\n
\n
\n 驳回人:\n {name}\n
\n
\n 驳回原因:\n {remark}\n
\n
\n
\n
遇到问题?
\n
\n 请联系驳回人:\n {linkName}{linkPhone}\n
\n
\n
\n
\n\n\n', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'); - - - - - - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql deleted file mode 100644 index b95b706f1..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql +++ /dev/null @@ -1,2 +0,0 @@ -delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知'); -alter table wx_msg_model drop column email_bg_img; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql deleted file mode 100644 index 51acaa124..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql +++ /dev/null @@ -1 +0,0 @@ -alter table wx_merchant add column top_time datetime default now() comment '置顶时间'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql deleted file mode 100644 index aca7cc15c..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_score_rules set rules = JSON_REMOVE(rules,'$[3]'); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql deleted file mode 100644 index 6ea1044b5..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE wx_mall - ADD COLUMN sale_type tinyint(2) DEFAULT '1' COMMENT '销售类型', - ADD COLUMN valid_start DATE default null COMMENT '启用起始时间', - ADD COLUMN valid_end DATE default null COMMENT '启用结束时间'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql deleted file mode 100644 index e04f44ffb..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql +++ /dev/null @@ -1 +0,0 @@ -alter table wx_profit_sharing_receiver add column is_use smallint(2) default 0 comment '是否使用1使用0不使用'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql deleted file mode 100644 index 0aba7bb9a..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql +++ /dev/null @@ -1,102 +0,0 @@ -#商户分账账户新增通知商管 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(80,'456','10','商户分账账户新增通知商管','富茂','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(110,'1001','10','商户分账账户新增通知商管','长融世贸广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(210,'1002','10','商户分账账户新增通知商管','同保楼 同福街','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(310,'1003','10','商户分账账户新增通知商管','杭州东站西子国际','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(410,'1004','10','商户分账账户新增通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(510,'1005','10','商户分账账户新增通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(610,'1006','10','商户分账账户新增通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(710,'1007','10','商户分账账户新增通知商管','澳林广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null); -#商户分账账户新增通知商户 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(81,'456','11','商户分账账户新增通知商户','富茂','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(111,'1001','11','商户分账账户新增通知商户','长融世贸广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(211,'1002','11','商户分账账户新增通知商户','同保楼 同福街','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(311,'1003','11','商户分账账户新增通知商户','杭州东站西子国际','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(411,'1004','11','商户分账账户新增通知商户','莱迪1086商业中心','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(511,'1005','11','商户分账账户新增通知商户','永修铜锣湾广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(611,'1006','11','商户分账账户新增通知商户','欧堡利亚海悦城','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(711,'1007','11','商户分账账户新增通知商户','澳林广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -#商户分账账户变更通知商管 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(82,'456','12','商户分账账户变更通知商管','富茂','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(112,'1001','12','商户分账账户变更通知商管','长融世贸广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(212,'1002','12','商户分账账户变更通知商管','同保楼 同福街','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(312,'1003','12','商户分账账户变更通知商管','杭州东站西子国际','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(412,'1004','12','商户分账账户变更通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(512,'1005','12','商户分账账户变更通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(612,'1006','12','商户分账账户变更通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(712,'1007','12','商户分账账户变更通知商管','澳林广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null); -#商户分账账户变更通知商户 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(83,'456','13','商户分账账户变更通知商户','富茂','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(113,'1001','13','商户分账账户变更通知商户','长融世贸广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(213,'1002','13','商户分账账户变更通知商户','同保楼 同福街','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(313,'1003','13','商户分账账户变更通知商户','杭州东站西子国际','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(413,'1004','13','商户分账账户变更通知商户','莱迪1086商业中心','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(513,'1005','13','商户分账账户变更通知商户','永修铜锣湾广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(613,'1006','13','商户分账账户变更通知商户','欧堡利亚海悦城','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(713,'1007','13','商户分账账户变更通知商户','澳林广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null); -#商户分账账户使用回执 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(84,'456','14','商户分账账户不使用回执','富茂','商管已同意{account}作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(114,'1001','14','商户分账账户不使用回执','长融世贸广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(214,'1002','14','商户分账账户不使用回执','同保楼 同福街','商管已同意]{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(314,'1003','14','商户分账账户不使用回执','杭州东站西子国际','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(414,'1004','14','商户分账账户不使用回执','莱迪1086商业中心','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(514,'1005','14','商户分账账户不使用回执','永修铜锣湾广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(614,'1006','14','商户分账账户不使用回执','欧堡利亚海悦城','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(714,'1007','14','商户分账账户不使用回执','澳林广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null); -#商户分账账户不使用回执 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(85,'456','15','商户分账账户使用回执','富茂','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(115,'1001','15','商户分账账户使用回执','长融世贸广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(215,'1002','15','商户分账账户使用回执','同保楼 同福街','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(315,'1003','15','商户分账账户使用回执','杭州东站西子国际','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(415,'1004','15','商户分账账户使用回执','莱迪1086商业中心','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(515,'1005','15','商户分账账户使用回执','永修铜锣湾广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(615,'1006','15','商户分账账户使用回执','欧堡利亚海悦城','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(715,'1007','15','商户分账账户使用回执','澳林广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql deleted file mode 100644 index b301981d5..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql +++ /dev/null @@ -1,5 +0,0 @@ -alter table wx_profit_sharing_receiver -modify column is_use smallint(2) default 2 comment '是否使用0使用1不使用2申请'; -update wx_profit_sharing_receiver set is_use =0 where status=0; -update wx_profit_sharing_receiver set is_use =1 where status=1; - diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql deleted file mode 100644 index 3895904d4..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE `wx_car_cmd_log` -ADD COLUMN `plateNumber` VARCHAR(32) GENERATED ALWAYS AS (json_unquote(json_extract(`cmd_json`,'$.plateNumber'))) VIRTUAL AFTER `cmd_json`; -ALTER TABLE `wx_car_cmd_log` -ADD INDEX `idx_plateNumber` (`plateNumber` ASC, `tenant_id` ASC); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql deleted file mode 100644 index 12e60bbcf..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql +++ /dev/null @@ -1,2 +0,0 @@ -update wx_coupon_channel set begin_time = create_date where begin_time is null; -update wx_coupon_channel co, wx_coupon c set co.end_time = c.valid_end_date where co.target_ad != 2 and co.target_ad != 8 and co.coupon_id = c.id and c.valid_type = 1 and co.end_time is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql deleted file mode 100644 index 2b62e3cf3..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql +++ /dev/null @@ -1,4 +0,0 @@ -update wx_coupon_channel c set type = (select type from wx_coupon where id = c.coupon_id ), -business = (select business from wx_coupon where id = c.coupon_id ), -sub_business = (select sub_business from wx_coupon where id = c.coupon_id ) -where c.type is null or c.business is null or c.sub_business is null \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql deleted file mode 100644 index c91d231d7..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql +++ /dev/null @@ -1,24 +0,0 @@ -#商户分账账户删除提醒 -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(86,'456','16','商户分账账户删除提醒','富茂','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(116,'1001','16','商户分账账户删除提醒','长融世贸广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(216,'1002','16','商户分账账户删除提醒','同保楼 同福街','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(316,'1003','16','商户分账账户删除提醒','杭州东站西子国际','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(416,'1004','16','商户分账账户删除提醒','莱迪1086商业中心','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(516,'1005','16','商户分账账户删除提醒','永修铜锣湾广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(616,'1006','16','商户分账账户删除提醒','欧堡利亚海悦城','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); -insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(716,'1007','16','商户分账账户删除提醒','澳林广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null); - -#删除不需要的短信模板 -delete from wx_msg_validationcode_model where id in (80,82,110,112,210,212,310,312,410,412,510,512,610,612,710,712); -#商户分账账户新增通知商户内容更新 -update wx_msg_validationcode_model set content='您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户' where id in(81,111,211,311,411,511,611,711); -#商户分账账户变更通知商户内容更新 -update wx_msg_validationcode_model set content='您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户' where id in(83,113,213,313,413,513,613,713); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql deleted file mode 100644 index 50f8a052b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql +++ /dev/null @@ -1,9 +0,0 @@ -DROP TABLE IF EXISTS `mall_resource` ; -CREATE TABLE `mall_resource` ( - `id` bigint(64) NOT NULL, - `tenant_id` varchar(50) DEFAULT NULL COMMENT '租户ID', - `bucket` varchar(20) DEFAULT '' COMMENT 'bucket名称', - `s3_key` varchar(100) DEFAULT NULL COMMENT 's3 key', - `url` varchar(1024) DEFAULT NULL COMMENT 's3 url', - PRIMARY KEY (`id`) -) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='资源表' CHECKSUM=0 DELAY_KEY_WRITE=0; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql deleted file mode 100644 index 3e95db4bd..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE wx_merchant_trade_daily - ADD COLUMN trade_count int(10) DEFAULT 0 COMMENT '交易笔数'; - -ALTER TABLE wx_merchant_trade_daily - ADD COLUMN proof varchar(500) DEFAULT NULL COMMENT '凭证'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql deleted file mode 100644 index dc2ab0060..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql +++ /dev/null @@ -1,9 +0,0 @@ -UPDATE `wx_tags` SET `name` = '活跃度低' WHERE (`id` = '110'); -UPDATE `wx_tags` SET `name` = '活跃度中' WHERE (`id` = '111'); -UPDATE `wx_tags` SET `name` = '活跃度高' WHERE (`id` = '112'); -UPDATE `wx_tags` SET `name` = '消费频率低' WHERE (`id` = '107'); -UPDATE `wx_tags` SET `name` = '消费频率中' WHERE (`id` = '108'); -UPDATE `wx_tags` SET `name` = '消费频率高' WHERE (`id` = '109'); -UPDATE `wx_tags` SET `name` = '实惠型消费' WHERE (`id` = '104'); -UPDATE `wx_tags` SET `name` = '享乐型消费' WHERE (`id` = '105'); -UPDATE `wx_tags` SET `name` = '品质型消费' WHERE (`id` = '106'); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql deleted file mode 100644 index 5a0a1bbad..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE wx_merchant - ADD COLUMN qr_code varchar(500) DEFAULT NULL COMMENT '二维码地址'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql deleted file mode 100644 index df6b39ddc..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql +++ /dev/null @@ -1,2 +0,0 @@ -update wx_bill_rent set owe=receive_pay-pay where status in (2,4); -update wx_bill_property set owe=receive_pay-pay where status in(2,4); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql deleted file mode 100644 index c1e584402..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_merchant` -ADD COLUMN `introduction` VARCHAR(2048) NULL DEFAULT NULL AFTER `qr_code`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql deleted file mode 100644 index f576a8ba8..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql +++ /dev/null @@ -1,25 +0,0 @@ -DROP TABLE IF EXISTS `mall_sale_type` ; -CREATE TABLE `mall_sale_type` ( - `id` bigint(64) NOT NULL, - `name` varchar(32) DEFAULT NULL COMMENT '销售类型', - `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:标准版 2:速享版 3.营销版', - `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', - `menus` json DEFAULT NULL COMMENT '菜单列表', - PRIMARY KEY (`id`), - UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; - -INSERT INTO `mall_sale_type` - (`id`,`name`, `type`, `period`, `menus`) -VALUES - (1, '尊享全能版', 1, 12, - '[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' - ), - (2, '尊享营销版', 2, 12, - '[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]' - ), - (3, '速享版', 3, 1, - '[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]' - ) - - ; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql deleted file mode 100644 index 04c41e937..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_coupon - ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`; - -UPDATE wx_coupon SET cover_picture=json_array(cover_img) WHERE cover_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql deleted file mode 100644 index 2c4b23148..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_campaign - ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`; - -UPDATE wx_campaign SET cover_picture=json_array(cover_img) WHERE cover_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql deleted file mode 100644 index 2b249e938..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_topic - ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover`; - -UPDATE wx_topic SET cover_picture=json_array(cover) WHERE cover_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql deleted file mode 100644 index 8bf1df2d2..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_msg_validationcode_model set content = '截止今日{merName}的账单共计欠缴{price}元,请登录{app}小程序查看账单并交费。' where type = 8 \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql deleted file mode 100644 index 0918f95b8..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql +++ /dev/null @@ -1,155 +0,0 @@ -DROP TABLE IF EXISTS `mall_permission` ; -CREATE TABLE `mall_permission` ( - `id` bigint(64) NOT NULL, - `name` varchar(32) DEFAULT NULL COMMENT '权限名称', - `parent_id` bigint(64) DEFAULT NULL COMMENT '父编号ID,一级菜单为0', - `available` varchar(1) DEFAULT 'Y' COMMENT '是否可用 Y/N', - `permission` varchar(50) DEFAULT NULL COMMENT '授权(多个用逗号分隔,如:user:list,user:create)', - `resource_type` tinyint(2) DEFAULT NULL COMMENT '资源类型0:目录 1:菜单 2:按钮 3:其它', - `module_color` varchar(10) DEFAULT NULL COMMENT '菜单背景色-1级菜单使用', - `module_color_num` varchar(15) DEFAULT NULL COMMENT '菜单字体颜色-1级菜单使用', - `url` varchar(50) DEFAULT NULL COMMENT '资源路径(user/list or http://localhost/1.html)', - `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标', - `version_type` tinyint(2) DEFAULT NULL COMMENT '版本类型(0:标准版)', - `sort` int(10) DEFAULT NULL COMMENT '排序', - PRIMARY KEY (`id`), - UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统权限表(当前到button)' CHECKSUM=0 DELAY_KEY_WRITE=0; - -INSERT INTO `mall_permission` - (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) -VALUES - (1, '数据塔台', 0, 'Y', null, 0, '#EE7653', '238,118,83', null, null, 0, 1), - (2, '商户商铺', 0, 'Y', null, 0, '#51A9C9', '81,169,201', null, null, 0, 2), - (3, '合同管理', 0, 'Y', null, 0, '#5A76BF', '90,118,191', null, null, 0, 3), - (4, '账单管理', 0, 'Y', null, 0, '#3FC496', '63,196,150', null, null, 0, 4), - (5, '会员系统', 0, 'Y', null, 0, '#6B5EC9', '107,94,201', null, null, 0, 5), - (6, '营销系统', 0, 'Y', null, 0, '#C85963', '200,89,99', null, null, 0, 6), - (7, '账号管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 9), - (8, '移动端数据塔台', 0, 'Y', null, 3, '#B23D8B', '178,61,139', null, null, 0, 8), - (9, '智能硬件', 0, 'Y', null, 0, '#E19549', '225,149,73', null, null, 0, 7), - (10, '首页', 0, 'Y', null, 1, '#E19549', '225,149,73', null, null, 0, 10), - (50, '系统管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 50), - - (101, '数据总览', 1, 'Y', null, 1, null, null, 'zonglan', 'icon-fumao-shujuzonglan', 0, 101), - (102, '运营数据', 1, 'Y', null, 1, null, null, 'yunying', 'icon-shuju1', 0, 102), - (103, '客流数据', 1, 'Y', null, 1, null, null, 'keliu', 'icon-shuju', 0, 103), - (104, '车流数据', 1, 'Y', null, 1, null, null, 'cheliu', 'icon-shujuquxianzoushiqushijiantouzhuzhuangtubiao', 0, 104), - (105, '线上营销交易', 1, 'Y', null, 1, null, null, 'yingxiao', 'icon-shuju2', 0, 105), - (106, '用户数据', 1, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-yonghushuju', 0, 106), - (107, 'WIFI使用数据', 1, 'Y', null, 1, null, null, 'wifiuse', 'icon-wifi', 0, 107), - - (201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 202), - (202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 203), - (203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 204), - (204, '商户收银', 2, 'Y', null, 1, null, null, 'merchantCashierList', 'icon-shouyintai', 0, 205), - (205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 206), - (206, '租赁概览', 2, 'Y', null, 1, null, null, 'dataShoprental', 'icon-chuzu', 0, 201), - - (211, '店铺', 201, 'Y', null, 1, null, null, 'shoplist', null, 0, 211), - (212, '多经点位', 201, 'Y', null, 1, null, null, 'pointlist', null, 0, 212), - (221, '店铺商户', 202, 'Y', null, 1, null, null, 'merchantList', null, 0, 221), - (222, '多经点位商户', 202, 'Y', null, 1, null, null, 'pointmerchantList', null, 0, 222), - (251, '品牌列表', 205, 'Y', null, 1, null, null, 'brandlist', null, 0, 251), - - (301, '商铺租赁合同', 3, 'Y', null, 1, null, null, 'rentlist', 'icon-zhangdan', 0, 301), - (302, '商铺物业合同', 3, 'Y', null, 1, null, null, 'tenementlist', 'icon-zulinhetong1', 0, 302), - (303, '多经点位租赁合同', 3, 'Y', null, 1, null, null, 'pointrentlist', 'icon-wuyehetong', 0, 303), - (304, '多经点位物业合同', 3, 'Y', null, 1, null, null, 'pointtenementlist', 'icon-changfangwuyehetong', 0, 304), - - (401, '账单总览', 4, 'Y', null, 1, null, null, 'collectionRate', 'icon-feiyongshoujiao-', 0, 401), - (402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-wodezulinzhangdan', 0, 404), - (403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 405), - (404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-zulinhetong', 0, 406), - (405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 407), - (406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 408), - (407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 409), - (408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 410), - (409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 411), - (410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 412), - (411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 413), - (412, '账单列表', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 402), - (413, '商户账单', 4, 'Y', null, 1, null, null, 'collectionRateList', 'icon-bucaozulin', 0, 403), - - (501, '用户概览', 5, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-tubiaochicundaochuSVGshangchuandaoalibaba-', 0, 501), - (502, '用户数量', 5, 'Y', null, 1, null, null, 'huiyuanShuliang', 'icon-yonghuguanli2', 0, 502), - (503, '拓客分析', 5, 'Y', null, 1, null, null, 'huiyuanTuoke', 'icon-tuoke', 0, 503), - (504, '会员结构', 5, 'Y', null, 1, null, null, 'huiyuanJiegou', 'icon-bianjiICONCopy', 0, 504), - (505, '会员列表', 5, 'Y', null, 1, null, null, 'huiyuanList', 'icon-huiyuanliebiao', 0, 505), - (506, '会员成长值', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 506), - (507, '会员积分', 5, 'Y', null, 0, null, null, null, 'icon-jifen', 0, 507), - (508, '积分商城', 5, 'Y', null, 0, null, null, null, 'icon-jifenshangchengb', 0, 508), - (509, '停车会员', 5, 'Y', null, 1, null, null, 'parkingList', 'icon-tingchechang1', 0, 509), - (511, '等级设置', 506, 'Y', null, 1, null, null, 'czdengji', null, 0, 511), - (512, '规则设置', 506, 'Y', null, 1, null, null, 'czguize', null, 0, 512), - (513, '会员权益', 506, 'Y', null, 1, null, null, 'interestsMembers', null, 0, 513), - (521, '积分兑换', 507, 'Y', null, 1, null, null, 'duihuan', null, 0, 521), - (522, '积分规则', 507, 'Y', null, 1, null, null, 'guize', null, 0, 522), - (523, '积分变更记录', 507, 'Y', null, 1, null, null, 'biangeng', null, 0, 523), - (531, '商城管理', 508, 'Y', null, 1, null, null, 'jifensc', null, 0, 531), - (532, '积分券', 508, 'Y', null, 1, null, null, 'jifenq', null, 0, 532), - (533, '停车券', 508, 'Y', null, 1, null, null, 'tingcheq', null, 0, 533), - - (601, '营销统计', 6, 'Y', null, 0, null, null, null, 'icon-stat', 0, 601), - (602, '优惠券', 6, 'Y', null, 0, null, null, null, 'icon-iconfontyouhuiquan', 0, 602), - (603, '购物卡', 6, 'Y', null, 0, null, null, null, 'icon-qiapian', 0, 603), - (604, '营销活动', 6, 'Y', null, 0, null, null, null, 'icon-kanjia', 0, 604), - (605, '主题营销', 6, 'Y', null, 0, null, null, null, 'icon-qian', 0, 605), - (606, '渠道投放', 6, 'Y', null, 0, null, null, null, 'icon-piliangtoufang', 0, 606), - (607, '答题问卷', 6, 'Y', null, 1, null, null, 'questionsettinglist', 'icon-wenjuan', 0, 607), - (608, '场景投放', 6, 'Y', null, 0, null, null, null, 'icon-icon-test', 0, 608), - (609, '精准投放', 6, 'Y', null, 0, null, null, null, 'icon-jingzhuntoufang', 0, 609), - (610, '订单管理', 6, 'Y', null, 0, null, null, 'orderList', 'icon-dingdanguanli', 0, 610), - (611, '疲劳度设置', 6, 'Y', null, 1, null, null, 'pilaodu', 'icon-pilaojiashi', 0, 612), - (612, '营销物料', 6, 'Y', null, 1, null, null, 'xiaochengxupath', 'icon-wuliaoguanli-', 0, 611), - - (621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 622), - (622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 623), - (623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 624), - (624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 625), - (625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 626), - (626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 627), - (627, '营销分析', 601, 'Y', null, 1, null, null, 'dataZonglan', 'icon-wifi', 0, 621), - - (641, '通用券', 602, 'Y', null, 1, null, null, 'tongyong', null, 0, 641), - (642, '满减券', 602, 'Y', null, 1, null, null, 'manjianlist', null, 0, 642), - (643, '代金券', 602, 'Y', null, 1, null, null, 'daijinlist', null, 0, 643), - (644, '礼品券', 602, 'Y', null, 1, null, null, 'lipinlist', null, 0, 644), - (645, '停车券', 602, 'Y', null, 1, null, null, 'tingchelist', null, 0, 645), - - (651, '消费卡', 603, 'Y', null, 1, null, null, 'introducing', null, 0, 651), - - (661, '砍价', 604, 'Y', null, 1, null, null, 'bargainlist', null, 0, 661), - (662, '拼团', 604, 'Y', null, 1, null, null, 'spellgroup', null, 0, 662), - - (671, '宣传页', 605, 'Y', null, 1, null, null, 'XuanChuanList', null, 0, 671), - (672, '互动营销游戏', 605, 'Y', null, 1, null, null, 'gamesetting', null, 0, 672), - - (673, '广告大屏', 605, 'Y', null, 1, null, null, 'adscreen', null, 0, 673), - (674, '专题', 605, 'Y', null, 1, null, null, 'topictoufang', null, 0, 674), - - (681, '列表投放', 606, 'Y', null, 1, null, null, 'xiaochengxu', null, 0, 681), - (682, '限时抢购', 606, 'Y', null, 1, null, null, 'flashsale', null, 0, 682), - (683, '购物卡频道', 606, 'Y', null, 1, null, null, 'introcardput', null, 0, 683), - (684, '砍价', 606, 'Y', null, 1, null, null, 'bargainCoupon', null, 0, 684), - (685, '拼团', 606, 'Y', null, 1, null, null, 'groupbooktoufang', null, 0, 685), - - (691, '停车发券', 608, 'Y', null, 1, null, null, 'tingchetoufang', null, 0, 691), - (692, '核销发券', 608, 'Y', null, 1, null, null, 'hexiaotoufang', null, 0, 692), - (693, '收银台发券', 608, 'Y', null, 1, null, null, 'paymentb', null, 0, 693), - (694, '交易发劵', 608, 'Y', null, 1, null, null, 'buycoupon', null, 0, 694), - - (701, '精准发券', 609, 'Y', null, 1, null, null, 'jingzhuntoufang', null, 0, 701), - (702, '标签短信', 609, 'Y', null, 1, null, null, 'msglist', null, 0, 702), - - (711, '劵订单', 610, 'Y', null, 1, null, null, 'orderList', null, 0, 711), - (712, '卡订单', 610, 'Y', null, 1, null, null, 'sellingCardRecord', null, 0, 712), - (713, '卡消费订单', 610, 'Y', null, 1, null, null, 'consumRecord', null, 0, 713), - - (901, '角色管理', 7, 'Y', null, 1, null, null, 'ruleList', 'icon-navicon-yhgl', 0, 901), - (902, '用户管理', 7, 'Y', null, 1, null, null, 'userList', 'icon-yonghuguanli', 0, 902), - - (951, '广告大屏', 9, 'Y', null, 0, null, null, 'bigScreentList', 'icon-navicon-yhgl', 0, 951), - (961, '大屏管理', 951, 'Y', null, 1, null, null, 'bigScreentList', null, 0, 961) - - ; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql deleted file mode 100644 index 5e18d9fe6..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE wx_template_msg - ADD COLUMN `custom_param` json DEFAULT null COMMENT '自定义参数' after `type`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql deleted file mode 100644 index 1946c6fe5..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql +++ /dev/null @@ -1,17 +0,0 @@ - -ALTER TABLE `wx_template_msg` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; - -UPDATE wx_template_msg -SET custom_param= -'{"index":["keyword1","keyword2","keyword3","keyword4","keyword5","keyword6","keyword7"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}元","keyword6":"{keyword6}","keyword7":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword7}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}' -WHERE type = 1; - -UPDATE wx_template_msg -SET custom_param='{"index":["keyword1","keyword2","keyword3","keyword4"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword4}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}' -WHERE type = 2; -UPDATE wx_template_msg -SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","remark"],"first":"商家{first}的券被核销","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}' -WHERE type = 102; -UPDATE wx_template_msg -SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","keyword4","keyword5","remark"],"first":"您有新的惊喜,请点详情查看","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}' -WHERE type = 103; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql deleted file mode 100644 index 160106eed..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE wx_property_contract - ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年'; - -ALTER TABLE wx_rent_contract - ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql deleted file mode 100644 index c836e197f..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_coupon - ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`; - -UPDATE wx_coupon SET detail_picture='[]' WHERE detail_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql deleted file mode 100644 index 9fb958e29..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_campaign - ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`; - -UPDATE wx_campaign SET detail_picture='[]' WHERE detail_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql deleted file mode 100644 index 9e9237000..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql +++ /dev/null @@ -1,7 +0,0 @@ - - - -ALTER TABLE wx_topic - ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`; - -UPDATE wx_topic SET detail_picture='[]' WHERE detail_picture is null; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql deleted file mode 100644 index b690b621a..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_msg_validationcode_model set model_id=500 where name in( '审批通知','待办通知','欠缴账单通知','驳回通知','审批通过通知','待缴账单通知') \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql deleted file mode 100644 index f3bc7a460..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE wx_property_contract - ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)'; - -ALTER TABLE wx_rent_contract - ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql deleted file mode 100644 index 467f4acbf..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_merchant` -ADD COLUMN `action_desc` VARCHAR(2048) NULL DEFAULT NULL AFTER `introduction`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql deleted file mode 100644 index cf51b3867..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql +++ /dev/null @@ -1,2 +0,0 @@ -update wx_property_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ; -update wx_rent_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql deleted file mode 100644 index dca67ea13..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `mall_user_info` -ADD INDEX `index_name` (`name` ASC); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql deleted file mode 100644 index ebb0de472..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE wx_coupon_channel - ADD COLUMN qr_code VARCHAR(500) DEFAULT NULL COMMENT '二维码'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql deleted file mode 100644 index 23c10f5b7..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_msg_validationcode_model set content = '{merName}当期的待缴账单为{price}元,截止日期为{date} ,请登录{app}小程序查看账单并交费。' where type = 7 \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql deleted file mode 100644 index 935786b46..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_weapp_audit_status` -ADD COLUMN `screen_shot` VARCHAR(250) NULL DEFAULT NULL AFTER `audit_err_code`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql deleted file mode 100644 index beb5e85a4..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_rent_contract` -ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称'; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql deleted file mode 100644 index f6c1fcb50..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql +++ /dev/null @@ -1 +0,0 @@ -update wx_merchant set cover_picture=json_array(img_url) where img_url is not null and (cover_picture is null or cover_picture=''); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql deleted file mode 100644 index f58146e98..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql +++ /dev/null @@ -1,3 +0,0 @@ -UPDATE `mall_permission` SET icon = 'icon-zhangdan4' WHERE id = 401; -UPDATE `mall_permission` SET icon = 'icon-zhangdanmingxi' WHERE id = 412; -UPDATE `mall_permission` SET icon = 'icon-zhangdan5' WHERE id = 402; diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql deleted file mode 100644 index 74f21608b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql +++ /dev/null @@ -1,53 +0,0 @@ -DROP TABLE IF EXISTS `sys_monitor`; -CREATE TABLE `sys_monitor` ( - `id` bigint(20) NOT NULL, - `name` varchar(50) NOT NULL COMMENT '网址名称', - `url` varchar(255) NOT NULL COMMENT '网址url', - `type` tinyint(2) DEFAULT '1' COMMENT '1=网址监控', - `deploy` tinyint(2) DEFAULT '1' COMMENT '1=dev 2=test 3=release', - `enable` tinyint(2) DEFAULT '0' COMMENT '0:enable 1:disable', - `err_msg` varchar(50) DEFAULT NULL COMMENT '错误信息', - PRIMARY KEY (`id`), - UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='网络监控' CHECKSUM=0 DELAY_KEY_WRITE=0; - -INSERT INTO `sys_monitor` (`id`,`name`,`url`,`type`,`deploy`,`enable`,`err_msg`) VALUES -(1, "dev-管理端","https://mall.youlane.cn/api/version", 1, 1, 1, "{name}: {url} 不响应"), -(2, "dev-C端","https://ciformall.youlane.cn/C/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"), -(3, "dev-B端","https://biformall.youlane.cn/B/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"), -(4, "dev-Schedule","http://202.165.179.86:5000/S/version", 1, 1, 1, "{name}: {url} 不响应"), -(5, "dev-消息服务器","http://202.165.179.86:5001/mq/version", 1, 1, 1, "{name}: {url} 不响应"), -(6, "dev-websocket服务器","http://202.165.179.86:7100/W/version", 1, 1, 1, "{name}: {url} 不响应"), -(7, "dev-微信第三方开放平台","https://open.youlane.cn/O/version", 1, 1, 1, "{name}: {url} 不响应"), -(8, "dev-移动端数据塔台","https://mobile.youlane.cn/#/", 1, 1, 1, "{name}: {url} 不响应"), -(9, "dev-幸运卡牌","https://game.youlane.cn/luckCard/index.html", 1, 1, 1, "{name}: {url} 不响应"), -(10, "dev-幸运砸金蛋","https://game.youlane.cn/goldEgg/index.html", 1, 1, 1, "{name}: {url} 不响应"), -(11, "dev-幸运刮刮乐","https://game.youlane.cn/guaguale/index.html", 1, 1, 1, "{name}: {url} 不响应"), -(12, "dev-callback","http://202.165.179.86:9100/version", 1, 1, 1, "{name}: {url} 不响应"), - -(101, "test-管理端","https://admintest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"), -(102, "test-C端","https://ctest.malls.iformall.com/C/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"), -(103, "test-B端","https://btest.malls.iformall.com/B/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"), -(104, "test-Schedule","https://stest.malls.iformall.com/S/version", 1, 2, 0, "{name}: {url} 不响应"), -(105, "test-消息服务器","https://stest.malls.iformall.com/mq/version", 1, 2, 0, "{name}: {url} 不响应"), -(106, "test-websocket服务器","https://stest.malls.iformall.com/W/version", 1, 2, 0, "{name}: {url} 不响应"), -(107, "test-微信第三方开放平台","https://opentest.malls.iformall.com/O/version", 1, 2, 0, "{name}: {url} 不响应"), -(108, "test-移动端数据塔台","https://mobiletest.malls.iformall.com/#/", 1, 2, 0, "{name}: {url} 不响应"), -(109, "test-幸运卡牌","https://gametest.malls.iformall.com/game/luckCard/index.html", 1, 2, 0, "{name}: {url} 不响应"), -(110, "test-幸运砸金蛋","https://gametest.malls.iformall.com/game/goldEgg/index.html", 1, 2, 0, "{name}: {url} 不响应"), -(111, "test-幸运刮刮乐","https://gametest.malls.iformall.com/game/guaguale/index.html", 1, 2, 0, "{name}: {url} 不响应"), -(112, "test-callback","https://callbacktest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"), - -(201, "生产环境-管理端","https://admin.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应"), -(202, "生产环境-C端","https://c.malls.iformall.com/C/api/mall/version", 1, 3, 0, "{name}: {url} 不响应"), -(203, "生产环境-B端","https://b.malls.iformall.com/B/api/mall/version", 1, 3, 0, "{name}: {url}不响应"), -(204, "生产环境-Schedule","https://s.malls.iformall.com/S/version", 1, 3, 0, "{name}: {url}不响应"), -(205, "生产环境-消息服务器","https://s.malls.iformall.com/mq/version", 1, 3, 0, "{name}: {url}不响应"), -(206, "生产环境-websocket服务器","https://s.malls.iformall.com/W/version", 1, 3, 0, "{name}: {url}不响应"), -(207, "生产环境-微信第三方开放平台","https://open.malls.iformall.com/O/version", 1, 3, 0, "{name}: {url}不响应"), -(208, "生产环境-移动端数据塔台","https://mobile.malls.iformall.com/#/", 1, 3, 0, "{name}: {url}不响应"), -(209, "生产环境-幸运卡牌","https://game.malls.iformall.com/game/luckCard/index.html", 1, 3, 0, "{name}: {url}不响应"), -(210, "生产环境-幸运砸金蛋","https://game.malls.iformall.com/game/goldEgg/index.html", 1, 3, 0, "{name}: {url}不响应"), -(211, "生产环境-幸运刮刮乐","https://game.malls.iformall.com/game/guaguale/index.html", 1, 3, 0, "{name}: {url}不响应"), -(212, "生产环境-callback","https://callback.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应") -; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql deleted file mode 100644 index 140b7760b..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `wx_property_contract` -ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称'; From eca8e4336f0004a60798ccfc125fd0b40c6ce7bf Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:37:50 +0800 Subject: [PATCH 024/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906041530__L_ALTER_RENT.sql | 5 +++++ .../main/java/com/iformall/domain/po/WxPropertyContract.java | 1 - .../src/main/java/com/iformall/domain/po/WxRentContract.java | 1 - .../src/main/resources/mapper/WxPropertyContractMapper.xml | 3 ++- .../src/main/resources/mapper/WxRentContractMapper.xml | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql new file mode 100644 index 000000000..fe3c60944 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql @@ -0,0 +1,5 @@ +alter table wx_rent_contract +add column `rent_start_type` int(1) DEFAULT 1 COMMENT '1按租赁日生产2按计租日生成账单'; + +alter table wx_property_contract +add column `rent_start_type` int(1) DEFAULT 1 COMMENT '1按租赁日生产2按计租日生成账单'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index ef522ab1d..858ef5d61 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -178,7 +178,6 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - @Transient private Integer rentStartType; public static enum Field diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index f75eaf79a..739ff60f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -218,7 +218,6 @@ public class WxRentContract extends BaseEntity { private String subjectName; @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - @Transient private Integer rentStartType; // public Integer getAdjustPeriod() { diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 8cfb72821..ea604c4c2 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -41,6 +41,7 @@ +
@@ -50,7 +51,7 @@ `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, - `file_names`,price_unit,rent_price,subject_name + `file_names`,price_unit,rent_price,subject_name,rent_start_type diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 1cf032510..089abc2d5 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -47,6 +47,7 @@ + @@ -57,7 +58,7 @@ `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, - `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name` + `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type From 024ae09e5d76a79aa9133faaac96262704d13e36 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 15:16:10 +0800 Subject: [PATCH 025/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][sql=E5=8F=8A=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCampaign.java | 8 ++++++ .../resources/mapper/WxCampaignMapper.xml | 26 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 613980c68..85a773c45 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -89,6 +89,14 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType") private Integer activityType; + @Transient + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + protected Date starttime; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + protected Date endtime; + @Transient @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") protected String weappPath; diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index a47aead7f..e2ced761a 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -22,12 +22,21 @@ + + + + + + + + `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, - `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` + `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, + `person_limit`,`activity_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type` @@ -114,6 +123,21 @@ and `update_time` = #{updateTime} + + + and `use_credit` = #{useCredit} + + + and `is_expired` = #{isExpired} + + + and `activity_type` = #{activityType} + + + + and `create_time` between #{starttime} and #{endtime} + + and id in From 2c9a325b2bf4093ec3c73e183ab8280752a199b5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 17:02:48 +0800 Subject: [PATCH 026/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906041700__ADD_CAMPAIGN_JOIN.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql new file mode 100644 index 000000000..944a92935 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql @@ -0,0 +1,20 @@ +drop table if exists `wx_campaign_join`; +CREATE TABLE IF NOT EXISTS `wx_campaign_join` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `user_id` bigint(20) NOT NULL COMMENT 'C端用户ID', + `campaign_id` bigint(20) NOT NULL COMMENT '活动ID', + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '姓名', + `nick_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '昵称', + `birthday` datetime COMMENT '生日', + `sex` smallint(2) DEFAULT 0 COMMENT '性别0保密1男2女', + `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '地址', + `answer` json NOT NULL COMMENT '答案', + `sign_in` smallint(2) DEFAULT 0 COMMENT '签到状态1签到0未签到', + `status` smallint(2) DEFAULT 0 COMMENT '状态0未确认-报名中1确认-报名成功2取消-报名失败3过期', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动报名表' CHECKSUM=0 DELAY_KEY_WRITE=0; + From 5c4cc64f0b48fdc40d0a9bdb3ebff337e54506cd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 17:11:10 +0800 Subject: [PATCH 027/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxCampaignJoin.java | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java new file mode 100644 index 000000000..e52d469b4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java @@ -0,0 +1,117 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_campaign_join") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCampaignJoin extends BaseEntity { + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") + private String tenantId; + + @io.swagger.annotations.ApiModelProperty(value = "C端用户ID", name = "userId") + private Long userId; + @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "campaignId") + private Long campaignId; + + @io.swagger.annotations.ApiModelProperty(value = "姓名", name = "name") + private String name; + @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") + private String nickName; + @io.swagger.annotations.ApiModelProperty(value = "生日", name = "birthday") + private Date birthday; + @io.swagger.annotations.ApiModelProperty(value = "性别0保密1男2女", name = "sex") + private Integer sex; + @io.swagger.annotations.ApiModelProperty(value = "地址", name = "address") + private String address; + + @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") + private String answer; + @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") + private Integer signIn; + @io.swagger.annotations.ApiModelProperty(value = "状态0未确认-报名中1确认-报名成功2取消-报名失败3过期", name = "status") + private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") + private Date updateTime; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(WxCampaignJoin.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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + 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)); + } + } +} From 28968de1518a1c09bbe72e28772e08df33e9b6d4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 17:34:47 +0800 Subject: [PATCH 028/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][sql=E5=8F=8A=E5=AE=9E?= =?UTF-8?q?=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906041735__ALTER_CAMPAIGN_JOIN.sql | 1 + .../iformall/domain/po/WxCampaignJoin.java | 3 + .../iformall/mapper/WxCampaignJoinMapper.java | 12 ++++ .../resources/mapper/WxCampaignJoinMapper.xml | 69 +++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql new file mode 100644 index 000000000..731336d8e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql @@ -0,0 +1 @@ +alter table `wx_campaign_join` add column phone varchar(15) NOT NULL COMMENT '手机号'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java index e52d469b4..bbaac9f68 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java @@ -49,6 +49,9 @@ public class WxCampaignJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "地址", name = "address") private String address; + @io.swagger.annotations.ApiModelProperty(value = "手机", name = "phone") + private String phone; + @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") private String answer; @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java new file mode 100644 index 000000000..fba49dd7c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCampaignJoin; + +import java.util.List; + +public interface WxCampaignJoinMapper extends CommonMapper { + + List findList(WxCampaignJoin params); + +} diff --git a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml new file mode 100644 index 000000000..fabdeb43c --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`user_id`,`campaign_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, + `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time` + + + + + where 1 = 1 + + and `id` = #{id} + + + and `tenant_id` = #{tenantId} + + + and `name` = #{name} + + + and `phone` = #{phone} + + + and `sex` = #{sex} + + + and `sign_in` = #{signIn} + + + and `status` = #{status} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + From 88c878ba55fd9f9258f45a917a13c8d51e332b29 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 17:36:10 +0800 Subject: [PATCH 029/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 16 +++++++++------- .../contract/WxRentContractController.java | 18 ++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 4d414ea4c..89f0bd950 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -67,15 +67,17 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-更新租赁开始日期") public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); - Integer rentStartType = wxPropertyContract.getRentStartType(); - wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ - wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + + if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + propertyContract.setRentalStartDate(propertyContract.getStartDate()); } + MallUserInfo user = getUser(); - wxPropertyContract.setTenantId(user.getTenantId()); - wxPropertyContract.setAdjustPeriodHandle(); - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + propertyContract.setTenantId(user.getTenantId()); + propertyContract.setAdjustPeriodHandle(); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 696ed660b..3dd06a2d6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -98,16 +99,17 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-更新租赁开始日期") public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); - Integer rentStartType = wxRentContract.getRentStartType(); - wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); - if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ - wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); + + if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + rentContract.setRentalStartDate(rentContract.getStartDate()); } MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - wxRentContract.setRentPriceHandle(); - return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); + rentContract.setTenantId(user.getTenantId()); + rentContract.setAdjustPeriodHandle(); + rentContract.setRentPriceHandle(); + return wxRentContractService.update(rentContract, user.getId(),user.getName()); } @PostMapping("update") From 0006e8191433861138eabdce4d27e4cacea36d5b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 17:46:20 +0800 Subject: [PATCH 030/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81wx=5Factivity=E8=A1=A8=E5=8F=8A?= =?UTF-8?q?=E5=AE=9E=E4=BD=93]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906041745__ALTER_ACTIVITY_TABLE.sql | 1 + .../com/iformall/domain/po/WxActivity.java | 138 ------------------ 2 files changed, 1 insertion(+), 138 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql delete mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql new file mode 100644 index 000000000..51952d1ce --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql @@ -0,0 +1 @@ +drop table if exists `wx_activity`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java deleted file mode 100644 index 451df0ba8..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.iformall.domain.po; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.Date; -import java.util.List; - -@Table(name = "wx_activity") -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class WxActivity extends BaseEntity { - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - - @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") - private String coverImg; - @io.swagger.annotations.ApiModelProperty(value = "主标题", name = "title") - private String title; - @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "subTitle") - private String subTitle; - @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") - private Integer useCredit; - @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") - private Integer credit; - @io.swagger.annotations.ApiModelProperty(value = "活动人数", name = "personLimit") - private Integer personLimit; - @io.swagger.annotations.ApiModelProperty(value = "活动正文", name = "detail") - private String detail; - @io.swagger.annotations.ApiModelProperty(value = "活动开始显示时间", name = "startTime") - private Date startTime; - @io.swagger.annotations.ApiModelProperty(value = "活动结束显示时间", name = "endTime") - private Date endTime; - @io.swagger.annotations.ApiModelProperty(value = "类型 1固定格式2自由图文", name = "type") - private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "0上线 1下线", name = "status") - private Integer status; - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") - private Date createTime; - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") - private Date updateTime; - @io.swagger.annotations.ApiModelProperty(value = "富文本", name = "html") - private String html; - - @Transient - @io.swagger.annotations.ApiModelProperty(value = "小程序路径", name = "weappPath") - protected String weappPath; - - @Transient - @io.swagger.annotations.ApiModelProperty(value = "小程序二维码Scene", name = "weappScene") - protected String weappScene; - - public String getWeappPath() { - if (type == null) - return "pages/index/index"; - return "pages/index/index?type=bd&bt=" + type + "&id=" + id; - } - - public String getWeappScene() { - if (type == null) - return ""; - return "t:bd:" + type + ":" + id; - } - - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_time` ASC"), ActivityTime_DESC("`activity_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(WxActivity.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()); - } - this.sortColumns = sb.toString(); - } - - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - 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)); - } - } -} From f489c7d9cb19c8c291e08426b48b4f83e64b5b66 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 20:18:49 +0800 Subject: [PATCH 031/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 12 ++++-- .../contract/WxRentContractController.java | 17 ++++---- .../service/WxPropertyContractService.java | 2 +- .../service/WxRentContractService.java | 7 ++-- .../impl/WxPropertyContractServiceImpl.java | 6 ++- .../impl/WxRentContractServiceImpl.java | 42 ++++++++++++------- 6 files changed, 53 insertions(+), 33 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 89f0bd950..79e1e2368 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,7 +7,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; import com.iformall.enums.EnumRentStartType; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.service.WxBillPropertyService; @@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.Map; /** @@ -60,7 +60,11 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + + if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); + } + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),0); } @PostMapping("updateRentStartTime") @@ -77,7 +81,7 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); - return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),1); } @@ -88,7 +92,7 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),0); } @GetMapping("/del") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 3dd06a2d6..ea66724f1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -89,10 +89,11 @@ public class WxRentContractController extends BaseController { MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); + return wxRentContractService.save(wxRentContract, user.getId(),user.getName(),oldDate); } @PostMapping("updateRentStartTime") @@ -101,7 +102,7 @@ public class WxRentContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); - + Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ rentContract.setRentalStartDate(rentContract.getStartDate()); } @@ -109,7 +110,7 @@ public class WxRentContractController extends BaseController { rentContract.setTenantId(user.getTenantId()); rentContract.setAdjustPeriodHandle(); rentContract.setRentPriceHandle(); - return wxRentContractService.update(rentContract, user.getId(),user.getName()); + return wxRentContractService.update(rentContract, user.getId(),user.getName(),1,oldDate); } @PostMapping("update") @@ -120,10 +121,11 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); + return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),0,oldDate); } /** @@ -139,11 +141,11 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); - + Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); + return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),0,oldDate); } @PostMapping("updateFile") @@ -154,10 +156,11 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); } - return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); + return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName(),oldDate); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 31fbaef83..797c654e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -40,7 +40,7 @@ public interface WxPropertyContractService { * @param userId * @return */ - ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName); + ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName,int from); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 4f8145a37..aa1f67a5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -8,6 +8,7 @@ import io.swagger.models.auth.In; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; import java.util.Map; @@ -41,9 +42,9 @@ public interface WxRentContractService { * @param userName * @return */ - ResultData save(WxRentContract record,Long userId,String userName); + ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate); - ResultData update(WxRentContract record, Long userId,String userName); + ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate); /** * 根据Id删除实体 @@ -65,7 +66,7 @@ public interface WxRentContractService { void exportContract(HttpServletRequest request, HttpServletResponse response, String tenantId, Long id); - ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName); + ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate); ResultData updateRentContractStatus(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 292a23033..6eb306383 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -200,7 +200,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { + public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName,int from) { // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ @@ -289,7 +289,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } - record.setRentalStartDate(wxRentContract.getRentalStartDate()); + if(from != 1){ + record.setRentalStartDate(wxRentContract.getRentalStartDate()); + } record.setRentalEndDate(wxRentContract.getRentalEndDate()); record.setStartDate(wxRentContract.getStartDate()); record.setEndDate(wxRentContract.getEndDate()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b81e3c455..edf284495 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -246,7 +246,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData save(WxRentContract record,Long userId,String userName) { + public ResultData save(WxRentContract record,Long userId,String userName,Date oldRentStartDate) { //保存租赁合同信息 final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -343,7 +343,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { try { record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + + Date tempDate = record.getRentalStartDate(); + record.setRentalStartDate(oldRentStartDate); wxRentContractMapper.insertSelective(record); + record.setRentalStartDate(tempDate); } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -378,7 +382,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData update(WxRentContract record, Long userId,String userName) { + public ResultData update(WxRentContract record, Long userId,String userName,int from,Date oldRentStartDate) { //查询预账单用于展示 WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setRentContractId(record.getId()); @@ -387,7 +391,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List resultList = wxBillRentMapper.findList(wxBillRent); //更新 - ResultData resultData = getResultDataForUpdate(record, userId); + ResultData resultData = getResultDataForUpdate(record, userId,from,oldRentStartDate); if (resultData.code != Result.SUCCESS) { return resultData; } @@ -428,7 +432,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(wxRentContract); } - public ResultData getResultDataForUpdate(WxRentContract record, Long userId) { + public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate) { //更新租赁合同信息 WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId()); if (wxRentContract == null) { @@ -441,20 +445,23 @@ public class WxRentContractServiceImpl implements WxRentContractService { instance.add(dayType, record.getLease()); instance.add(Calendar.DAY_OF_MONTH, -1); - if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - BigDecimal hundred = new BigDecimal(100); - BigDecimal revenue = new BigDecimal(record.getRevenue() == null ? 0 : record.getRevenue()).divide(hundred); - BigDecimal payRatio = new BigDecimal(record.getPayRatio() == null ? 0 : record.getPayRatio()).divide(new BigDecimal(10000)); - BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); - record.setPrice(price.multiply(hundred).longValue()); - } else { - if (StringUtils.isNotEmpty(record.getPriceStr())) { - record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).longValue()); + if(from != 1){ + if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { + BigDecimal hundred = new BigDecimal(100); + BigDecimal revenue = new BigDecimal(record.getRevenue() == null ? 0 : record.getRevenue()).divide(hundred); + BigDecimal payRatio = new BigDecimal(record.getPayRatio() == null ? 0 : record.getPayRatio()).divide(new BigDecimal(10000)); + BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); + record.setPrice(price.multiply(hundred).longValue()); } else { - record.setPrice(0L); + if (StringUtils.isNotEmpty(record.getPriceStr())) { + record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).longValue()); + } else { + record.setPrice(0L); + } } } + if (StringUtils.isNotEmpty(record.getDepositStr())) { record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).longValue()); } else { @@ -519,7 +526,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { } try { + Date tempDate = record.getRentalStartDate(); + record.setRentalStartDate(oldRentStartDate); wxRentContractMapper.updateByPrimaryKeySelective(record); + record.setRentalStartDate(tempDate); } catch (Exception e) { logger.error("更新租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); @@ -1247,14 +1257,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData updateFile(WxRentContract record, Long userId,String userName) { + public ResultData updateFile(WxRentContract record, Long userId,String userName,Date oldRentStartDate) { // 保存调整金额(预账单调整) if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ for (WxBillRent wxBillRent:record.getPreviewBillRentList()) { wxBillRentMapper.update(wxBillRent); } } - ResultData resultData = getResultDataForUpdate(record, userId); + ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate); if (resultData.code != Result.SUCCESS) { return resultData; } From 051d32723c3cb266c602d220aeeb570f62ef24bb Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 21:45:44 +0800 Subject: [PATCH 032/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 6 +++--- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 6eb306383..b00a73034 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -563,7 +563,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); - if(i == 0){//第一期 + if(i == billTimeVoList.size()-1){//最后 + needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); + }else if(i == 0){//第一期 if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); @@ -579,8 +581,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } needpay = new Double(months * priceD).longValue(); } - }else if(i == billTimeVoList.size()-1){//最后 - needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); if(isFirstDay(billTimeVo.getStartDate())){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index edf284495..40a39c0d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -961,7 +961,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { } SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); - if(i == 0){//第一期 + if(i == billTimeVoList.size()-1){//最后 + needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); + }else if(i == 0){//第一期 if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ if(isFirstDay(billTimeVo.getStartDate())){ int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); @@ -981,8 +983,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); } } - }else if(i == billTimeVoList.size()-1){//最后 - needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); }else{//中间 int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); if(isFirstDay(billTimeVo.getStartDate())){ @@ -2013,3 +2013,4 @@ public class WxRentContractServiceImpl implements WxRentContractService { + From 0876c58e6065f9cabec41b0f544f4dd4e83eb932 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 11:07:14 +0800 Subject: [PATCH 033/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=AE=A1=E7=A7=9F=E9=9D=A2=E7=A7=AF=E4=B8=BA0=E6=8A=A5?= =?UTF-8?q?=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 6 +++--- .../iformall/service/impl/WxRentContractServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index b00a73034..59a303c6e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -111,7 +111,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Double rentPrice = rentInfoObject.getDouble("rentPrice"); Long price = wxPropertyContract.getPrice()/100; if(rentPrice == null){ - if(StringUtils.isNotBlank(wxPropertyContract.getRentArea())) { + if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())&& !"0.0".equals(wxPropertyContract.getRentArea()) ) { Double rentArea = Double.parseDouble(wxPropertyContract.getRentArea()); rentPrice = new BigDecimal((float) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); rentInfoObject.put("rentPrice", rentPrice); @@ -120,8 +120,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } wxPropertyContract.setRentInfo(rentInfoArray.toJSONString()); }else{ - if(wxPropertyContract.getRentPrice() == null || "0".equals(wxPropertyContract.getRentPrice())){ - if(StringUtils.isNotBlank(wxPropertyContract.getRentArea())) { + if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())&& !"0.0".equals(wxPropertyContract.getRentArea()) ) { + if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())) { Long price = wxPropertyContract.getPrice() / 100; Double rentArea = Double.parseDouble(wxPropertyContract.getRentArea()); Double rentPrice = new BigDecimal((float) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 40a39c0d6..c0db34182 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -149,7 +149,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { Double rentPrice = rentInfoObject.getDouble("rentPrice"); Long price = wxRentContract.getPrice()/100; if(rentPrice == null){ - if(StringUtils.isNotBlank(wxRentContract.getRentArea())) { + if(StringUtils.isNotBlank(wxRentContract.getRentArea()) && !"0".equals(wxRentContract.getRentArea()) && !"0.00".equals(wxRentContract.getRentArea()) && !"0.0".equals(wxRentContract.getRentArea()) ) { Double rentArea = Double.parseDouble(wxRentContract.getRentArea()); rentPrice = new BigDecimal((float) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); rentInfoObject.put("rentPrice", rentPrice); @@ -159,7 +159,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContract.setRentInfo(rentInfoArray.toJSONString()); }else{ if(wxRentContract.getRentPrice() == null || "0".equals(wxRentContract.getRentPrice())){ - if(StringUtils.isNotBlank(wxRentContract.getRentArea())) { + if(StringUtils.isNotBlank(wxRentContract.getRentArea()) && !"0".equals(wxRentContract.getRentArea()) && !"0.00".equals(wxRentContract.getRentArea()) && !"0.0".equals(wxRentContract.getRentArea()) ) { Long price = wxRentContract.getPrice()/100; Double rentArea = Double.parseDouble(wxRentContract.getRentArea()); Double rentPrice = new BigDecimal((float)price/rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); From 67ff9726b96f17ccabd47c42ca357ce040f8d473 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 12:27:28 +0800 Subject: [PATCH 034/289] =?UTF-8?q?[cUser=E6=9F=A5=E9=87=8D][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=AF=8F=E5=A4=A9=E6=97=A9=E6=99=A8=E6=9F=A5?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/WxCUserCheckSchedule.java | 46 +++++++++++++++++++ .../com/iformall/mapper/WxCUserMapper.java | 6 +-- .../main/resources/mapper/WxCUserMapper.xml | 4 ++ 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java new file mode 100644 index 000000000..509c1d6a9 --- /dev/null +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -0,0 +1,46 @@ +package com.iformall.schedule; + +import com.iformall.mapper.WxCUserMapper; +import com.iformall.service.MailService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +@Component +public class WxCUserCheckSchedule { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private boolean isFmException; + + @Autowired + private String fmExceptionEmails; + + @Autowired + private MailService mailService; + + @Autowired + private WxCUserMapper cUserMapper; + + @Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 + // @Scheduled(cron = "0 */1 * * * ?") // 测试1分钟一次 + public void cuserCheckDuplicate() { + + List> mapList = cUserMapper.checkCountByTenantOpenId(); + if(mapList.size()> 0) { + String message = "wx_c_user异常,有重复数据"; + logger.error(message); + if(isFmException) { + String[] receivers = fmExceptionEmails.split(","); + //发送邮件 + mailService.sendSimpleMail(receivers, message, message); + } + } + } +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index ff4f07394..6d81d824f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -1,9 +1,7 @@ package com.iformall.mapper; -import java.util.HashMap; import java.util.List; - -import org.apache.ibatis.annotations.Param; +import java.util.Map; import com.iformall.common.CommonMapper; import com.iformall.domain.dto.WxCUserBasicInfoDto; @@ -24,4 +22,6 @@ public interface WxCUserMapper extends CommonMapper { List listByChannel(WxCUser wxCUser); long countByChannel(WxCUser wxCUser); + + List> checkCountByTenantOpenId(); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 75c45f9c4..db945f466 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -293,4 +293,8 @@ + +
From 365ce2bb9c33c62d30bde64287b84f29468b3a24 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 4 Jun 2019 18:50:31 +0800 Subject: [PATCH 035/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=8A=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCampaignJoinController.java | 62 +++++++++++++++++++ .../service/WxCampaignJoinService.java | 13 ++++ .../impl/WxCampaignJoinServiceImpl.java | 38 ++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java new file mode 100644 index 000000000..3857254f5 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java @@ -0,0 +1,62 @@ +package com.iformall.controller.market; + +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.service.WxCampaignJoinService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("wxCampaignJoin") +@Api(description = "活动参与信息") +public class WxCampaignJoinController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxCampaignJoinService wxCampaignJoinService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "活动参与信息-列表") + public ResultData list(@ModelAttribute WxCampaignJoin wxCampaignJoin, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::list"); + if (null == wxCampaignJoin) wxCampaignJoin = new WxCampaignJoin(); + wxCampaignJoin.setTenantId(getTenantId()); + wxCampaignJoin.setSortColumns(WxCampaignJoin.Field.Id_DESC); + final PageInfo page = wxCampaignJoinService.listAsPage(wxCampaignJoin, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("确认或取消报名") + @PostMapping("modifyStatus") + @SystemControllerLog(description = "宣传页-新增") + public ResultData modifyStatus(@RequestBody WxCampaignJoin wxCampaignJoin) { + logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::modifyStatus"); + + if (wxCampaignJoin.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); + } + + if (wxCampaignJoin.getStatus() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); + } + return wxCampaignJoinService.modifyStatus(wxCampaignJoin); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java new file mode 100644 index 000000000..a62cf88fd --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java @@ -0,0 +1,13 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCampaignJoin; + +public interface WxCampaignJoinService { + + PageInfo listAsPage(WxCampaignJoin wxCampaignJoin, Integer pageNum, Integer pageSize); + + ResultData modifyStatus(WxCampaignJoin wxCampaignJoin); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java new file mode 100644 index 000000000..bad753fc5 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -0,0 +1,38 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.mapper.WxCampaignJoinMapper; +import com.iformall.service.WxCampaignJoinService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author gongbiao + */ +@Service +public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxCampaignJoinMapper wxCampaignJoinMapper; + + + @Override + public PageInfo listAsPage(WxCampaignJoin record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCampaignJoinMapper.findList(record)); + } + + @Override + public ResultData modifyStatus(WxCampaignJoin wxCampaignJoin) { + wxCampaignJoinMapper.updateByPrimaryKeySelective(wxCampaignJoin); + return new ResultData(Result.SUCCESS, "操作成功"); + } + + +} From fcf4e95e2ca28f90f8d6870694a763667eff0268 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 12:56:34 +0800 Subject: [PATCH 036/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E3=80=81=E5=AF=BC=E5=87=BA=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=8F=91=E7=9F=AD=E4=BF=A1=E7=AD=89]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCampaignJoinController.java | 45 ++++++++- .../iformall/domain/po/WxCampaignJoin.java | 11 +++ .../enums/EnumCampaignJoinSignStatus.java | 36 +++++++ .../enums/EnumCampaignJoinStatus.java | 38 ++++++++ .../java/com/iformall/enums/EnumMsgModel.java | 1 + .../service/WxCampaignJoinService.java | 12 +++ .../impl/WxCampaignJoinServiceImpl.java | 94 +++++++++++++++++++ 7 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java index 3857254f5..6a4e3d89f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCampaignJoinService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,6 +17,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @author gongbiao */ @@ -45,7 +49,7 @@ public class WxCampaignJoinController extends BaseController { @ApiOperation("确认或取消报名") @PostMapping("modifyStatus") - @SystemControllerLog(description = "宣传页-新增") + @SystemControllerLog(description = "活动参与信息-确认或取消报名") public ResultData modifyStatus(@RequestBody WxCampaignJoin wxCampaignJoin) { logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::modifyStatus"); @@ -59,4 +63,43 @@ public class WxCampaignJoinController extends BaseController { return wxCampaignJoinService.modifyStatus(wxCampaignJoin); } + @ApiOperation("导出报名表") + @RequestMapping("/exportData") + @SystemControllerLog(description = "活动参与信息-导出报名表") + public void exportData(@ModelAttribute WxCampaignJoin wxCampaignJoin, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::exportData"); + if (wxCampaignJoin.getCampaignId() == null) { + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + } + wxCampaignJoin.setTenantId(getTenantId()); + wxCampaignJoinService.exportData(request, response, wxCampaignJoin); + + } + + @ApiOperation("查询报名总数") + @GetMapping("queryJoinInfo") + @SystemControllerLog(description = "活动参与信息-查询报名总数") + public ResultData queryJoinInfo(@ModelAttribute WxCampaignJoin wxCampaignJoin) { + logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::queryJoinInfo"); + + if (wxCampaignJoin.getCampaignId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + } + wxCampaignJoin.setTenantId(getTenantId()); + return wxCampaignJoinService.queryJoinInfo(wxCampaignJoin); + } + + @ApiOperation("确认报名完成") + @GetMapping("confirmCompletion") + @SystemControllerLog(description = "活动参与信息-确认报名完成") + public ResultData confirmCompletion(@ModelAttribute WxCampaignJoin wxCampaignJoin) { + logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::confirmCompletion"); + + if (wxCampaignJoin.getCampaignId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + } + wxCampaignJoin.setTenantId(getTenantId()); + return wxCampaignJoinService.confirmCompletion(wxCampaignJoin); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java index bbaac9f68..d64cd523d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -38,26 +39,36 @@ public class WxCampaignJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "campaignId") private Long campaignId; + @Excel(name = "姓名", width = 10, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "姓名", name = "name") private String name; + + @Excel(name = "微信昵称", width = 10, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") private String nickName; @io.swagger.annotations.ApiModelProperty(value = "生日", name = "birthday") private Date birthday; + + @Excel(name = "性别", replace = {"保密_0", "男_1", "女_2"}, width = 10, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value = "性别0保密1男2女", name = "sex") private Integer sex; + @io.swagger.annotations.ApiModelProperty(value = "地址", name = "address") private String address; + @Excel(name = "电话号码", width = 10, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value = "手机", name = "phone") private String phone; @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") private String answer; + @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") private Integer signIn; + @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "取消报名_2", "活动过期_3"}, width = 10, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "状态0未确认-报名中1确认-报名成功2取消-报名失败3过期", name = "status") private Integer status; + @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java new file mode 100644 index 000000000..02e982f5d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + + +/** + * @author gongbiao + */ +public enum EnumCampaignJoinSignStatus { + + YES(1, "签到"), + NO(0, "未签到"),; + + public static EnumCampaignJoinSignStatus getEnum(Integer code) { + for (EnumCampaignJoinSignStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCampaignJoinSignStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java new file mode 100644 index 000000000..f291561a1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + + +/** + * @author gongbiao + */ +public enum EnumCampaignJoinStatus { + + NOT_CONFIRMED(0, "未确认"), + CONFIRMED(1, "已确认"), + CANCEL(2, "已取消"), + EXPIRED(3, "活动过期"),; + + public static EnumCampaignJoinStatus getEnum(Integer code) { + for (EnumCampaignJoinStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCampaignJoinStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 4502d3688..71bd8df77 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -22,6 +22,7 @@ public enum EnumMsgModel { ACCEPT_SHARING_ACCOUNT_NOTIFY_MANAGER(14, "商户分账账户使用回执"), REJECT_SHARING_ACCOUNT_NOTIFY_MANAGER(15, "商户分账账户不使用回执"), DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT(16, "商户分账账户删除提醒"), + TIME_LIMIT_CAMPAIGN(17, "限时活动"), ; public static EnumMsgModel getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java index a62cf88fd..6edf1bb50 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java @@ -4,10 +4,22 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCampaignJoin; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author gongbiao + */ public interface WxCampaignJoinService { PageInfo listAsPage(WxCampaignJoin wxCampaignJoin, Integer pageNum, Integer pageSize); ResultData modifyStatus(WxCampaignJoin wxCampaignJoin); + void exportData(HttpServletRequest request, HttpServletResponse response, WxCampaignJoin wxCampaignJoin); + + ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin); + + ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index bad753fc5..3617f9e50 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -4,14 +4,30 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.domain.vo.WxBillDailyVo; +import com.iformall.enums.*; import com.iformall.mapper.WxCampaignJoinMapper; +import com.iformall.mapper.WxCampaignMapper; +import com.iformall.mq.MqBaseProducer; +import com.iformall.service.ExcelService; import com.iformall.service.WxCampaignJoinService; +import com.iformall.utils.DateUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author gongbiao */ @@ -22,6 +38,14 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { @Autowired WxCampaignJoinMapper wxCampaignJoinMapper; + @Autowired + WxCampaignMapper wxCampaignMapper; + + @Autowired + ExcelService excelService; + + @Autowired + private MqBaseProducer mqBaseProducer; @Override public PageInfo listAsPage(WxCampaignJoin record, Integer pageIndex, Integer pageSize) { @@ -34,5 +58,75 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { return new ResultData(Result.SUCCESS, "操作成功"); } + @Override + public void exportData(HttpServletRequest request, HttpServletResponse response, WxCampaignJoin wxCampaignJoin) { + WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); + String title = wxCampaign.getTitle(); + List list = wxCampaignJoinMapper.findList(wxCampaignJoin); + excelService.exportExcel(list, null, title, WxBillDailyVo.class, "报名表.xlsx", response, false); + } + + @Override + public ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin) { + WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); + //活动人数 + Integer personLimit = wxCampaign.getPersonLimit(); + //总人数 + int total = wxCampaignJoinMapper.selectCount(wxCampaignJoin); + wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); + //确认数 + int confirm = wxCampaignJoinMapper.selectCount(wxCampaignJoin); + Map data = new HashMap<>(); + data.put("personLimit", personLimit); + data.put("confirm", confirm); + data.put("total", total); + return new ResultData(data); + } + + @Override + public ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin) { + //1、修改活动状态 + WxCampaign wxCampaign = new WxCampaign(); + wxCampaign.setId(wxCampaignJoin.getCampaignId()); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); + wxCampaign.setUpdateTime(new Date()); + wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + //2、发送短信 + WxCampaign campaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); + List joinList = wxCampaignJoinMapper.select(wxCampaignJoin); + for (WxCampaignJoin join : joinList) { + sendMessage(join, campaign); + } + return new ResultData(); + } + + private void sendMessage(WxCampaignJoin join, WxCampaign campaign) { + logger.info("》》》》》》》》》》》"); + logger.info("活动发送短信开始"); + logger.info("》》》》》》》》》》》"); + //人名 + String name = join.getName(); + name = StringUtils.isNotEmpty(name) ? name : ""; + //找出用户手机号 + String phone = join.getPhone(); + //活动名 + String party = campaign.getTitle(); + String time = DateUtils.date2String(campaign.getActivityTime()); + Map msgReplaceMap = new HashMap(); + msgReplaceMap.put("name", name); + msgReplaceMap.put("party", party); + msgReplaceMap.put("time", time); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(join.getTenantId()); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info("》》》》》》》》》》》"); + logger.info("活动发送短信结束"); + logger.info("》》》》》》》》》》》"); + } + } From d3f602473177646b087d6aa23b66bb2f0f9c39b9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 12:59:51 +0800 Subject: [PATCH 037/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFsql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906051300__ADD_MSG_MODEL.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql new file mode 100644 index 000000000..a8fe1bbb8 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql @@ -0,0 +1,16 @@ +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(87,'456','17','限时活动','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(117,'1001','17','限时活动','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(217,'1002','17','限时活动','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(317,'1003','17','限时活动','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(417,'1004','17','限时活动','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(517,'1005','17','限时活动','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(617,'1006','17','限时活动','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(717,'1007','17','限时活动','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); From e2f02286ef52366b669a635b1de3b144667eea45 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 13:19:58 +0800 Subject: [PATCH 038/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFsql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906051300__ADD_MSG_MODEL.sql | 18 ++++++++++-------- .../migration/V201906051310__ADD_MSG_MODEL.sql | 18 ++++++++++++++++++ .../java/com/iformall/enums/EnumMsgModel.java | 3 ++- .../impl/WxCampaignJoinServiceImpl.java | 8 ++++---- 4 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql index a8fe1bbb8..cae336216 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql @@ -1,16 +1,18 @@ insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(87,'456','17','限时活动','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(87,'456','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(117,'1001','17','限时活动','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(117,'1001','17','限时活动报名成功','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(217,'1002','17','限时活动','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(217,'1002','17','限时活动报名成功','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(317,'1003','17','限时活动','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(317,'1003','17','限时活动报名成功','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(417,'1004','17','限时活动','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(417,'1004','17','限时活动报名成功','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(517,'1005','17','限时活动','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(517,'1005','17','限时活动报名成功','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(617,'1006','17','限时活动','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(617,'1006','17','限时活动报名成功','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) -values(717,'1007','17','限时活动','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +values(717,'1007','17','限时活动报名成功','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(1000000001,'789','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null); diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql new file mode 100644 index 000000000..550de04a7 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql @@ -0,0 +1,18 @@ +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(88,'456','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(118,'1001','18','限时活动参加提醒','长融世贸广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(218,'1002','18','限时活动参加提醒','同保楼 同福街','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(318,'1003','18','限时活动参加提醒','杭州东站西子国际','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(418,'1004','18','限时活动参加提醒','莱迪1086商业中心','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(518,'1005','18','限时活动参加提醒','永修铜锣湾广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(618,'1006','18','限时活动参加提醒','欧堡利亚海悦城','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(718,'1007','18','限时活动参加提醒','澳林广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); +insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id) +values(1000000002,'789','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index 71bd8df77..ae421dc72 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -22,7 +22,8 @@ public enum EnumMsgModel { ACCEPT_SHARING_ACCOUNT_NOTIFY_MANAGER(14, "商户分账账户使用回执"), REJECT_SHARING_ACCOUNT_NOTIFY_MANAGER(15, "商户分账账户不使用回执"), DELETE_SHARING_ACCOUNT_NOTIFY_MERCHANT(16, "商户分账账户删除提醒"), - TIME_LIMIT_CAMPAIGN(17, "限时活动"), + TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS(17, "限时活动报名成功"), + TIME_LIMIT_CAMPAIGN_NOTIFY(18, "限时活动参与提醒"), ; public static EnumMsgModel getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index 3617f9e50..2294427ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -105,20 +105,20 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { logger.info("活动发送短信开始"); logger.info("》》》》》》》》》》》"); //人名 - String name = join.getName(); - name = StringUtils.isNotEmpty(name) ? name : ""; + String person = join.getName(); + person = StringUtils.isNotEmpty(person) ? person : ""; //找出用户手机号 String phone = join.getPhone(); //活动名 String party = campaign.getTitle(); String time = DateUtils.date2String(campaign.getActivityTime()); Map msgReplaceMap = new HashMap(); - msgReplaceMap.put("name", name); + msgReplaceMap.put("person", person); msgReplaceMap.put("party", party); msgReplaceMap.put("time", time); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_JOIN_SUCCESS.getCode()); wxMsgRecord.setReceiver(phone); wxMsgRecord.setTenantId(join.getTenantId()); wxMsgRecord.setDynamicContentMap(msgReplaceMap); From 82f2567ef0d8c339ddb4bbc90f6f7bf73ca31a61 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 13:36:32 +0800 Subject: [PATCH 039/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906051308__L_ALTER_RENT.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxBrand.java | 4 +++- mallinkService/src/main/resources/mapper/WxBrandMapper.xml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql new file mode 100644 index 000000000..bdbcf050a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql @@ -0,0 +1,2 @@ +alter table wx_brand +add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index 840b92f74..bc8f5a6ea 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -3,7 +3,6 @@ package com.iformall.domain.po; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -53,6 +52,9 @@ public class WxBrand extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "createdate") private Date createdate; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml index 82a6971d9..f4cba5536 100644 --- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml @@ -10,15 +10,15 @@ - + - `id`,`name`,`createtime`,`updatetime`,`tenant_id`,`logo`,`summary`,`createdate` + `id`,`name`,`createtime`,`updatetime`,`tenant_id`,`logo`,`summary`,`createdate`,is_del - where 1 = 1 + where is_del = 0 and `id` = #{id} and `name` like concat('%',#{name},'%') and `createtime` = #{createtime} From 34be61dce2fd8facc2d3b7dd584058a1a810aa65 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 13:45:22 +0800 Subject: [PATCH 040/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFsql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...051300__ADD_MSG_MODEL.sql => V201906051345__ADD_MSG_MODEL.sql} | 0 ...051310__ADD_MSG_MODEL.sql => V201906051346__ADD_MSG_MODEL.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201906051300__ADD_MSG_MODEL.sql => V201906051345__ADD_MSG_MODEL.sql} (100%) rename mallinkAdmin/src/main/resources/db/migration/{V201906051310__ADD_MSG_MODEL.sql => V201906051346__ADD_MSG_MODEL.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051345__ADD_MSG_MODEL.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201906051300__ADD_MSG_MODEL.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906051345__ADD_MSG_MODEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051346__ADD_MSG_MODEL.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201906051310__ADD_MSG_MODEL.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906051346__ADD_MSG_MODEL.sql From aff42b6813690701e1ae2d88da613fe16788479a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 13:46:00 +0800 Subject: [PATCH 041/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E9=86=92=E7=9F=AD=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/BillNotificationSchedule.java | 115 +++++++----------- .../iformall/schedule/CampaginSchedule.java | 108 ++++++++++++++++ .../com/iformall/mapper/WxCampaignMapper.java | 14 +-- .../resources/mapper/WxCampaignMapper.xml | 5 + 4 files changed, 166 insertions(+), 76 deletions(-) create mode 100644 mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index 33311c52c..d40387d9b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -1,19 +1,21 @@ package com.iformall.schedule; -import com.alibaba.fastjson.JSONObject; +import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.WxCampaignJoin; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; -import com.iformall.mapper.*; +import com.iformall.mapper.WxCampaignJoinMapper; +import com.iformall.mapper.WxCampaignMapper; import com.iformall.mq.MqBaseProducer; -import com.iformall.service.WxBillAllService; +import com.iformall.utils.DateUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; + import java.util.List; import java.util.Map; @@ -26,81 +28,56 @@ public class BillNotificationSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxBillAllMapper wxBillAllMapper; + private WxCampaignMapper wxCampaignMapper; @Autowired - private MqBaseProducer mqBaseProducer; + private WxCampaignJoinMapper wxCampaignJoinMapper; @Autowired - WxBillAllService wxBillAllService; + private MqBaseProducer mqBaseProducer; /** - * 每天9点执行 + * 每天12点执行 */ - @Scheduled(cron = "0 0 14 * * ?") - public void sendMsgFromBill() { - logger.info("账单通知任务启动"); - sendWaitPayBill(); - wxBillAllService.sendWaitPayBillEmail(); - sendOweBill(); - wxBillAllService.sendOweBillForEmail(); - logger.info("账单通知任务结束"); - } - - private void sendOweBill() { - logger.info("查询欠缴账单数据"); - List> oweBillList = wxBillAllMapper.getOweBill(); - for (Map bill : oweBillList) { - logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); - String tenantId = bill.get("tenantId").toString(); - BigDecimal owe = (BigDecimal) bill.get("owe"); - BigDecimal price = owe.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); - String phone = bill.get("linkPhone").toString(); - String appname = bill.get("appname").toString(); - String merchantName = bill.get("merchantName").toString(); - logger.info("欠缴账单检验短信配置信息"); - - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); - Map map = new HashedMap(); - map.put("price",price.toString()); - map.put("app",appname); - map.put("merName",merchantName); - wxMsgRecord.setDynamicContentMap(map); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); + @Scheduled(cron = "0 0 12 * * ?") + public void sendMsg() { + logger.info("限时活动参与提醒任务启动"); + WxCampaign wxCampaign = new WxCampaign(); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + List wxCampaigns = wxCampaignMapper.queryNotify(wxCampaign); + WxCampaignJoin wxCampaignJoin = null; + for (WxCampaign campaign : wxCampaigns) { + wxCampaignJoin = new WxCampaignJoin(); + wxCampaignJoin.setTenantId(campaign.getTenantId()); + wxCampaignJoin.setCampaignId(campaign.getId()); + wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); + List list = wxCampaignJoinMapper.findList(wxCampaignJoin); + for (WxCampaignJoin campaignJoin : list) { + send(campaign, campaignJoin); + } } } - private void sendWaitPayBill() { - logger.info("查询待缴账单数据"); - List> waitBillList = wxBillAllMapper.getWaitPayBill(); - for (Map bill : waitBillList) { - logger.info("待缴账单账单:" + JSONObject.toJSONString(bill)); - String tenantId = bill.get("tenantId").toString(); - String receiveDate = bill.get("receiveDate").toString(); - BigDecimal needPay = (BigDecimal) bill.get("needPay"); - BigDecimal price = needPay.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); - String phone = bill.get("linkPhone").toString(); - String appname = bill.get("appname").toString(); - String merchantName = bill.get("merchantName").toString(); - logger.info("待缴账单检验短信配置信息"); + private void send(WxCampaign campaign, WxCampaignJoin campaignJoin) { + logger.info("限时活动参与提醒短信发送开始"); + String phone = campaignJoin.getPhone(); + String person = campaignJoin.getName(); + person = StringUtils.isNotEmpty(person) ? person : ""; + String time = DateUtils.date2String(campaign.getActivityTime()); + String party = campaign.getTitle(); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(campaignJoin.getTenantId()); + Map map = new HashedMap(); + map.put("person", person); + map.put("party", party); + map.put("time", time); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info("限时活动参与提醒短信发送结束"); - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); - Map map = new HashedMap(); - map.put("price",price.toString()); - map.put("app",appname); - map.put("date",receiveDate); - map.put("merName",merchantName); - wxMsgRecord.setDynamicContentMap(map); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); - } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java new file mode 100644 index 000000000..eb0fb38ce --- /dev/null +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java @@ -0,0 +1,108 @@ +package com.iformall.schedule; + +import com.alibaba.fastjson.JSONObject; +import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.enums.*; +import com.iformall.mapper.WxBillAllMapper; +import com.iformall.mq.MqBaseProducer; +import com.iformall.service.WxBillAllService; +import org.apache.commons.collections.map.HashedMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.List; +import java.util.Map; + +/** + * @author gongbiao + */ +@Component +public class CampaginSchedule { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxBillAllMapper wxBillAllMapper; + + @Autowired + private MqBaseProducer mqBaseProducer; + + @Autowired + WxBillAllService wxBillAllService; + + /** + * 每天9点执行 + */ + @Scheduled(cron = "0 0 14 * * ?") + public void sendMsgFromBill() { + logger.info("账单通知任务启动"); + sendWaitPayBill(); + wxBillAllService.sendWaitPayBillEmail(); + sendOweBill(); + wxBillAllService.sendOweBillForEmail(); + logger.info("账单通知任务结束"); + } + + private void sendOweBill() { + logger.info("查询欠缴账单数据"); + List> oweBillList = wxBillAllMapper.getOweBill(); + for (Map bill : oweBillList) { + logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); + String tenantId = bill.get("tenantId").toString(); + BigDecimal owe = (BigDecimal) bill.get("owe"); + BigDecimal price = owe.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); + String phone = bill.get("linkPhone").toString(); + String appname = bill.get("appname").toString(); + String merchantName = bill.get("merchantName").toString(); + logger.info("欠缴账单检验短信配置信息"); + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(tenantId); + Map map = new HashedMap(); + map.put("price", price.toString()); + map.put("app", appname); + map.put("merName", merchantName); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } + + private void sendWaitPayBill() { + logger.info("查询待缴账单数据"); + List> waitBillList = wxBillAllMapper.getWaitPayBill(); + for (Map bill : waitBillList) { + logger.info("待缴账单账单:" + JSONObject.toJSONString(bill)); + String tenantId = bill.get("tenantId").toString(); + String receiveDate = bill.get("receiveDate").toString(); + BigDecimal needPay = (BigDecimal) bill.get("needPay"); + BigDecimal price = needPay.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); + String phone = bill.get("linkPhone").toString(); + String appname = bill.get("appname").toString(); + String merchantName = bill.get("merchantName").toString(); + logger.info("待缴账单检验短信配置信息"); + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(tenantId); + Map map = new HashedMap(); + map.put("price", price.toString()); + map.put("app", appname); + map.put("date", receiveDate); + map.put("merName", merchantName); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index cb7d9559c..6c435dbc1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -5,17 +5,17 @@ import com.iformall.domain.po.WxCampaign; import java.util.List; +/** + * @author gongbiao + */ public interface WxCampaignMapper extends CommonMapper { - List findList(WxCampaign wxCampaign); + List findList(WxCampaign wxCampaign); List findCList(WxCampaign wxCampaign); - int getMaxSortNum(String tenantId); - - + int getMaxSortNum(String tenantId); + + List queryNotify(WxCampaign wxCampaign); - - - } diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index e2ced761a..400c6f554 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -164,6 +164,11 @@ + + From ab876d19e37aa7c6af400365be347ff4506872de Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 14:17:18 +0800 Subject: [PATCH 042/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxBrandController.java | 18 ++++++++++++++++++ .../migration/V201906051403__L_ALTER_RENT.sql | 2 ++ .../com/iformall/domain/po/WxMerchant.java | 4 ++++ .../iformall/service/WxMerchantService.java | 8 ++++++++ .../service/impl/WxMerchantServiceImpl.java | 5 +++++ .../main/resources/mapper/WxMerchantMapper.xml | 7 ++++++- 6 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 50ded68c6..e5a6cd2d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -6,10 +6,13 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.WxMerchant; import com.iformall.service.WxBrandService; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +33,8 @@ public class WxBrandController extends BaseController { @Autowired private WxBrandService wxBrandService; + @Autowired + private WxMerchantService wxMerchantService; @GetMapping("list") @@ -60,6 +65,19 @@ public class WxBrandController extends BaseController { public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); wxBrand.setTenantId(getTenantId()); + + if(wxBrand.getIsDel().equals(1)){ + //判断是否解绑商户 + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(wxBrand.getTenantId()); + wxMerchant.setIsDel(0); + wxMerchant.setBrand(wxBrand.getId()); + List merchantList = wxMerchantService.findList(wxMerchant); + if(CollectionUtils.isNotEmpty(merchantList)){ + return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); + } + } + return wxBrandService.update(wxBrand); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql new file mode 100644 index 000000000..1e6c799b3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql @@ -0,0 +1,2 @@ +alter table wx_merchant +add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 5bba77043..a9718c198 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -175,6 +175,10 @@ public class WxMerchant extends BaseEntity { @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; + + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") + private Integer isDel; + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index a800957d7..8b85b3cf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -43,6 +43,14 @@ public interface WxMerchantService { */ List etcpList(WxMerchant record); + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(WxMerchant record); + /** * 查询商户列表 * @param tenantId diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 3eb20c937..70fef769a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -148,6 +148,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantMapper.findList(record); } + @Override + public List findList(WxMerchant record) { + return wxMerchantMapper.findList(record); + } + @Override public List findList(String tenantId) { WxMerchant wxMerchant = new WxMerchant(); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index c341852b4..0aabe027e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -27,12 +27,14 @@ + + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, - `introduction`,`action_desc` + `introduction`,`action_desc`,is_del @@ -99,6 +101,9 @@ and `is_admin` = #{isAdmin} + + and `is_del` = #{isDel} + and id not in( select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is From f977e3443a9becd30a6344c1abce8f84e69d832f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 15:01:57 +0800 Subject: [PATCH 043/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxCampaignJoin.java | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql new file mode 100644 index 000000000..f63176f4a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql @@ -0,0 +1,2 @@ +alter table wx_campaign_join add column img_url json COMMENT '图片'; +update wx_campaign_join set img_url=json_array(); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java index d64cd523d..826a8b7c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java @@ -74,6 +74,9 @@ public class WxCampaignJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl") + private String img_url; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); private String value; From d2609545e377ba25a6c49698ca140fe44c4f52b2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 15:09:32 +0800 Subject: [PATCH 044/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E6=94=B9][=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCampaignJoinController.java | 10 +++++----- .../com/iformall/service/WxCampaignJoinService.java | 2 +- .../service/impl/WxCampaignJoinServiceImpl.java | 10 +--------- .../src/main/resources/mapper/WxCampaignJoinMapper.xml | 4 +++- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java index 6a4e3d89f..7df0b85ff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java @@ -89,17 +89,17 @@ public class WxCampaignJoinController extends BaseController { return wxCampaignJoinService.queryJoinInfo(wxCampaignJoin); } - @ApiOperation("确认报名完成") - @GetMapping("confirmCompletion") - @SystemControllerLog(description = "活动参与信息-确认报名完成") - public ResultData confirmCompletion(@ModelAttribute WxCampaignJoin wxCampaignJoin) { + @ApiOperation("发送短信") + @GetMapping("sendMsg") + @SystemControllerLog(description = "活动参与信息-发送短信") + public ResultData sendMsg(@ModelAttribute WxCampaignJoin wxCampaignJoin) { logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::confirmCompletion"); if (wxCampaignJoin.getCampaignId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); } wxCampaignJoin.setTenantId(getTenantId()); - return wxCampaignJoinService.confirmCompletion(wxCampaignJoin); + return wxCampaignJoinService.sendMsg(wxCampaignJoin); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java index 6edf1bb50..d7bcf9423 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java @@ -20,6 +20,6 @@ public interface WxCampaignJoinService { ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin); - ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin); + ResultData sendMsg(WxCampaignJoin wxCampaignJoin); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index 2294427ab..725d2953d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -23,7 +23,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -84,14 +83,7 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { } @Override - public ResultData confirmCompletion(WxCampaignJoin wxCampaignJoin) { - //1、修改活动状态 - WxCampaign wxCampaign = new WxCampaign(); - wxCampaign.setId(wxCampaignJoin.getCampaignId()); - wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); - wxCampaign.setUpdateTime(new Date()); - wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); - //2、发送短信 + public ResultData sendMsg(WxCampaignJoin wxCampaignJoin) { WxCampaign campaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); List joinList = wxCampaignJoinMapper.select(wxCampaignJoin); for (WxCampaignJoin join : joinList) { diff --git a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml index fabdeb43c..8e433e0ca 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml @@ -17,11 +17,13 @@ + + `id`,`tenant_id`,`user_id`,`campaign_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, - `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time` + `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url` From 5c24e35f7e4f3c0d05625d8bae96dd4ac06ca618 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 15:29:57 +0800 Subject: [PATCH 045/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906051530__ALTER_CAMPAIGN.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxCampaign.java | 6 ++++-- .../iformall/service/impl/WxCampaignJoinServiceImpl.java | 2 +- .../src/main/resources/mapper/WxCampaignMapper.xml | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql new file mode 100644 index 000000000..e81f2edac --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql @@ -0,0 +1,2 @@ +alter table wx_campaign add column `activity_end_time` datetime COMMENT '活动结束时间', +change column `activity_time` activity_start_time datetime COMMENT '活动开始时间'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 85a773c45..bddc6bbe0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -76,8 +76,10 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") private Integer personLimit; - @io.swagger.annotations.ApiModelProperty(value = "活动时间", name = "activityTime") - private Date activityTime; + @io.swagger.annotations.ApiModelProperty(value = "活动开始时间", name = "activityStartTime") + private Date activityStartTime; + @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") + private Date activityEndTime; @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") private Integer useCredit; @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java index 725d2953d..8de9cc1f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java @@ -103,7 +103,7 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { String phone = join.getPhone(); //活动名 String party = campaign.getTitle(); - String time = DateUtils.date2String(campaign.getActivityTime()); + String time = DateUtils.date2String(campaign.getActivityStartTime()); Map msgReplaceMap = new HashMap(); msgReplaceMap.put("person", person); msgReplaceMap.put("party", party); diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 400c6f554..8a31870ec 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -24,7 +24,8 @@ - + + @@ -36,7 +37,7 @@ `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, - `person_limit`,`activity_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type` + `person_limit`,`activity_start_time`,`activity_end_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type` From e23200de9d77fbadfac13106d9933427ea896b4b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 15:58:11 +0800 Subject: [PATCH 046/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/BillNotificationSchedule.java | 116 +++++++++++------- .../iformall/schedule/CampaginSchedule.java | 114 +++++++---------- .../resources/mapper/WxCampaignMapper.xml | 2 +- 3 files changed, 116 insertions(+), 116 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index d40387d9b..dadf31b93 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -1,21 +1,20 @@ package com.iformall.schedule; -import com.iformall.domain.po.WxCampaign; -import com.iformall.domain.po.WxCampaignJoin; +import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; -import com.iformall.mapper.WxCampaignJoinMapper; -import com.iformall.mapper.WxCampaignMapper; +import com.iformall.mapper.WxBillAllMapper; import com.iformall.mq.MqBaseProducer; -import com.iformall.utils.DateUtils; +import com.iformall.service.WxBillAllService; import org.apache.commons.collections.map.HashedMap; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.List; import java.util.Map; @@ -25,61 +24,86 @@ import java.util.Map; @Component public class BillNotificationSchedule { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxCampaignMapper wxCampaignMapper; + private WxBillAllMapper wxBillAllMapper; @Autowired - private WxCampaignJoinMapper wxCampaignJoinMapper; + private MqBaseProducer mqBaseProducer; @Autowired - private MqBaseProducer mqBaseProducer; + WxBillAllService wxBillAllService; /** - * 每天12点执行 + * 每天9点执行 */ - @Scheduled(cron = "0 0 12 * * ?") - public void sendMsg() { - logger.info("限时活动参与提醒任务启动"); - WxCampaign wxCampaign = new WxCampaign(); - wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - List wxCampaigns = wxCampaignMapper.queryNotify(wxCampaign); - WxCampaignJoin wxCampaignJoin = null; - for (WxCampaign campaign : wxCampaigns) { - wxCampaignJoin = new WxCampaignJoin(); - wxCampaignJoin.setTenantId(campaign.getTenantId()); - wxCampaignJoin.setCampaignId(campaign.getId()); - wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); - List list = wxCampaignJoinMapper.findList(wxCampaignJoin); - for (WxCampaignJoin campaignJoin : list) { - send(campaign, campaignJoin); - } - } + @Scheduled(cron = "0 0 14 * * ?") + public void sendMsgFromBill() { + logger.info("账单通知任务启动"); + sendWaitPayBill(); + wxBillAllService.sendWaitPayBillEmail(); + sendOweBill(); + wxBillAllService.sendOweBillForEmail(); + logger.info("账单通知任务结束"); } - private void send(WxCampaign campaign, WxCampaignJoin campaignJoin) { - logger.info("限时活动参与提醒短信发送开始"); - String phone = campaignJoin.getPhone(); - String person = campaignJoin.getName(); - person = StringUtils.isNotEmpty(person) ? person : ""; - String time = DateUtils.date2String(campaign.getActivityTime()); - String party = campaign.getTitle(); - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(campaignJoin.getTenantId()); - Map map = new HashedMap(); - map.put("person", person); - map.put("party", party); - map.put("time", time); - wxMsgRecord.setDynamicContentMap(map); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - logger.info("限时活动参与提醒短信发送结束"); + private void sendOweBill() { + logger.info("查询欠缴账单数据"); + List> oweBillList = wxBillAllMapper.getOweBill(); + for (Map bill : oweBillList) { + logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); + String tenantId = bill.get("tenantId").toString(); + BigDecimal owe = (BigDecimal) bill.get("owe"); + BigDecimal price = owe.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); + String phone = bill.get("linkPhone").toString(); + String appname = bill.get("appname").toString(); + String merchantName = bill.get("merchantName").toString(); + logger.info("欠缴账单检验短信配置信息"); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(tenantId); + Map map = new HashedMap(); + map.put("price", price.toString()); + map.put("app", appname); + map.put("merName", merchantName); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } } + private void sendWaitPayBill() { + logger.info("查询待缴账单数据"); + List> waitBillList = wxBillAllMapper.getWaitPayBill(); + for (Map bill : waitBillList) { + logger.info("待缴账单账单:" + JSONObject.toJSONString(bill)); + String tenantId = bill.get("tenantId").toString(); + String receiveDate = bill.get("receiveDate").toString(); + BigDecimal needPay = (BigDecimal) bill.get("needPay"); + BigDecimal price = needPay.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); + String phone = bill.get("linkPhone").toString(); + String appname = bill.get("appname").toString(); + String merchantName = bill.get("merchantName").toString(); + logger.info("待缴账单检验短信配置信息"); + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(tenantId); + Map map = new HashedMap(); + map.put("price", price.toString()); + map.put("app", appname); + map.put("date", receiveDate); + map.put("merName", merchantName); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java index eb0fb38ce..a282ef35c 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java @@ -1,20 +1,21 @@ package com.iformall.schedule; -import com.alibaba.fastjson.JSONObject; +import com.iformall.domain.po.WxCampaign; +import com.iformall.domain.po.WxCampaignJoin; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; -import com.iformall.mapper.WxBillAllMapper; +import com.iformall.mapper.WxCampaignJoinMapper; +import com.iformall.mapper.WxCampaignMapper; import com.iformall.mq.MqBaseProducer; -import com.iformall.service.WxBillAllService; +import com.iformall.utils.DateUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.List; import java.util.Map; @@ -27,81 +28,56 @@ public class CampaginSchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxBillAllMapper wxBillAllMapper; + private WxCampaignMapper wxCampaignMapper; @Autowired - private MqBaseProducer mqBaseProducer; + private WxCampaignJoinMapper wxCampaignJoinMapper; @Autowired - WxBillAllService wxBillAllService; + private MqBaseProducer mqBaseProducer; /** - * 每天9点执行 + * 每天12点执行 */ - @Scheduled(cron = "0 0 14 * * ?") - public void sendMsgFromBill() { - logger.info("账单通知任务启动"); - sendWaitPayBill(); - wxBillAllService.sendWaitPayBillEmail(); - sendOweBill(); - wxBillAllService.sendOweBillForEmail(); - logger.info("账单通知任务结束"); - } - - private void sendOweBill() { - logger.info("查询欠缴账单数据"); - List> oweBillList = wxBillAllMapper.getOweBill(); - for (Map bill : oweBillList) { - logger.info("欠缴账单:" + JSONObject.toJSONString(bill)); - String tenantId = bill.get("tenantId").toString(); - BigDecimal owe = (BigDecimal) bill.get("owe"); - BigDecimal price = owe.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); - String phone = bill.get("linkPhone").toString(); - String appname = bill.get("appname").toString(); - String merchantName = bill.get("merchantName").toString(); - logger.info("欠缴账单检验短信配置信息"); - - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); - Map map = new HashedMap(); - map.put("price", price.toString()); - map.put("app", appname); - map.put("merName", merchantName); - wxMsgRecord.setDynamicContentMap(map); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + @Scheduled(cron = "0 0 12 * * ?") + public void sendMsg() { + logger.info("限时活动参与提醒任务启动"); + WxCampaign wxCampaign = new WxCampaign(); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + List wxCampaigns = wxCampaignMapper.queryNotify(wxCampaign); + WxCampaignJoin wxCampaignJoin = null; + for (WxCampaign campaign : wxCampaigns) { + wxCampaignJoin = new WxCampaignJoin(); + wxCampaignJoin.setTenantId(campaign.getTenantId()); + wxCampaignJoin.setCampaignId(campaign.getId()); + wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); + List list = wxCampaignJoinMapper.findList(wxCampaignJoin); + for (WxCampaignJoin campaignJoin : list) { + send(campaign, campaignJoin); + } } } - private void sendWaitPayBill() { - logger.info("查询待缴账单数据"); - List> waitBillList = wxBillAllMapper.getWaitPayBill(); - for (Map bill : waitBillList) { - logger.info("待缴账单账单:" + JSONObject.toJSONString(bill)); - String tenantId = bill.get("tenantId").toString(); - String receiveDate = bill.get("receiveDate").toString(); - BigDecimal needPay = (BigDecimal) bill.get("needPay"); - BigDecimal price = needPay.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); - String phone = bill.get("linkPhone").toString(); - String appname = bill.get("appname").toString(); - String merchantName = bill.get("merchantName").toString(); - logger.info("待缴账单检验短信配置信息"); + private void send(WxCampaign campaign, WxCampaignJoin campaignJoin) { + logger.info("限时活动参与提醒短信发送开始"); + String phone = campaignJoin.getPhone(); + String person = campaignJoin.getName(); + person = StringUtils.isNotEmpty(person) ? person : ""; + String time = DateUtils.date2String(campaign.getActivityStartTime()); + String party = campaign.getTitle(); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setTenantId(campaignJoin.getTenantId()); + Map map = new HashedMap(); + map.put("person", person); + map.put("party", party); + map.put("time", time); + wxMsgRecord.setDynamicContentMap(map); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info("限时活动参与提醒短信发送结束"); - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(tenantId); - Map map = new HashedMap(); - map.put("price", price.toString()); - map.put("app", appname); - map.put("date", receiveDate); - map.put("merName", merchantName); - wxMsgRecord.setDynamicContentMap(map); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - } } diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 8a31870ec..374f98ea2 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -168,7 +168,7 @@ From fd9c29cc4e0197045a1d3202ac8a7a531a065790 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 16:00:13 +0800 Subject: [PATCH 047/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxBrandController.java | 4 ++-- .../java/com/iformall/service/impl/WxBrandServiceImpl.java | 6 ++++++ .../src/main/resources/mapper/WxMerchantMapper.xml | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index e5a6cd2d0..d8225462c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -77,8 +77,8 @@ public class WxBrandController extends BaseController { return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); } } - - return wxBrandService.update(wxBrand); + wxBrandService.update(wxBrand); + return new ResultData(Result.SUCCESS, "操作成功"); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index fe457ad52..9d0d98c48 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -69,6 +69,12 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public ResultData update(WxBrand wxBrand) { + if(wxBrand.getIsDel().equals(1)){ + wxBrand.setUpdatetime(new Date()); + wxBrandMapper.updateByPrimaryKeySelective(wxBrand); + return new ResultData(Result.SUCCESS, "操作成功"); + } + if(StringUtils.isEmpty(wxBrand.getName())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"品牌名称不能为空"); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0aabe027e..713f24cf6 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -104,6 +104,9 @@ and `is_del` = #{isDel} + + and `brand` = #{brand} + and id not in( select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is From 9228b32e6a1af34296f1df5cda9d121f313a874a Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 16:05:25 +0800 Subject: [PATCH 048/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 713f24cf6..5466e712c 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -38,7 +38,7 @@ - where 1 = 1 + where is_del = 0 and `id` = #{id} From 1e81b13d0561f2e25fdb2bf8aa3905e507529552 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 16:29:42 +0800 Subject: [PATCH 049/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B4=BB=E5=8A=A8=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=8F=8A=E4=B8=8B=E7=BA=BF=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/CampaginSchedule.java | 22 ++++++++++++ .../iformall/enums/EnumCampaignExpired.java | 36 +++++++++++++++++++ .../com/iformall/mapper/WxCampaignMapper.java | 3 ++ .../resources/mapper/WxCampaignMapper.xml | 8 +++++ 4 files changed, 69 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java index a282ef35c..50773b1f7 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java @@ -80,5 +80,27 @@ public class CampaginSchedule { } + /** + * 5分钟一次 + */ + @Scheduled(cron = "0 */5 * * * ?") + public void campaignExipred() { + logger.info("活动报名结束任务"); + WxCampaign campaign = new WxCampaign(); + campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + campaign.setIsExpired(EnumCampaignExpired.YES.getCode()); + wxCampaignMapper.campaignExipred(campaign); + } + + /** + * 5分钟一次 + */ + @Scheduled(cron = "0 */5 * * * ?") + public void campaignCompletion() { + logger.info("活动结束任务"); + WxCampaign campaign = new WxCampaign(); + campaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); + wxCampaignMapper.campaignCompletion(campaign); + } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java new file mode 100644 index 000000000..e69b07c82 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCampaignExpired { + + + YES(1, "过期"), + NO(0, "未到期"),; + + public static EnumCampaignExpired getEnum(Integer code) { + for (EnumCampaignExpired value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCampaignExpired(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index 6c435dbc1..994bd9a6f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -18,4 +18,7 @@ public interface WxCampaignMapper extends CommonMapper { List queryNotify(WxCampaign wxCampaign); + void campaignExipred(WxCampaign campaign); + + void campaignCompletion(WxCampaign campaign); } diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 374f98ea2..07bb8979e 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -170,6 +170,14 @@ resultType="com.iformall.domain.po.WxCampaign"> select id,title,activity_start_time,tenant_id from wx_campaign where status=${status} and DATEDIFF(activity_start_time,now())=3 + + + update wx_campaign set is_expired=${isExpired} where status=${status} and now()>valid_end_date + + + + update wx_campaign set status#{status} where status!=${status} and now()>activity_end_time + From 3797ff8c9ef9c617e230381ee7e0769b2a6c5c72 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 16:30:42 +0800 Subject: [PATCH 050/289] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B4=BB=E5=8A=A8=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=8F=8A=E4=B8=8B=E7=BA=BF=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxCampaignMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 07bb8979e..d774fc889 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -176,7 +176,7 @@ - update wx_campaign set status#{status} where status!=${status} and now()>activity_end_time + update wx_campaign set status=#{status} where status!=${status} and now()>activity_end_time From ba0f9dddebd20eb81802605bd4f521a3fbc4827a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:05:14 +0800 Subject: [PATCH 051/289] =?UTF-8?q?[banner=E5=9B=BE][=E6=96=B0=E5=A2=9E]:b?= =?UTF-8?q?anner=E5=9B=BE=E6=94=AF=E6=8C=81=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906051702__ALTER_CAMPAIGN.sql | 7 ++++ .../com/iformall/domain/po/WxCampaign.java | 24 ++++++++++-- .../com/iformall/enums/EnumCampaignType.java | 1 + .../iformall/service/WxCampaignService.java | 24 ++++++++---- .../service/impl/WxCampaignServiceImpl.java | 39 ++++++++++++++++++- 5 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql new file mode 100644 index 000000000..ed9eeabdc --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql @@ -0,0 +1,7 @@ +ALTER TABLE `wx_campaign` +ADD COLUMN `produce_type` SMALLINT(2) NULL DEFAULT NULL COMMENT '产品类型,类型3适用(1-券,2-报名)', +ADD COLUMN `produce_id` BIGINT(20) NULL DEFAULT NULL COMMENT '产品ID,类型3适用', +ADD COLUMN `page_path` VARCHAR(50) NULL DEFAULT NULL COMMENT '小程序跳转路径,类型3适用', +ADD COLUMN `page_scene` VARCHAR(50) NULL DEFAULT NULL COMMENT '小程序跳转二维码,类型3适用', +CHANGE COLUMN `type` `type` SMALLINT(11) NULL DEFAULT NULL COMMENT '类型 1-固定格式,2-自由图文,3-小程序路径' ; + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index bddc6bbe0..e630aaa1a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCampaignType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -57,7 +58,7 @@ public class WxCampaign extends BaseEntity { private Date validEndDate; @io.swagger.annotations.ApiModelProperty(value="图文详情",name="imgDetail") private String imgDetail; - @io.swagger.annotations.ApiModelProperty(value="类型:0:促销 1:宣传页",name="type") + @io.swagger.annotations.ApiModelProperty(value="类型:1-固定格式,2-自由图文,3-小程序路径",name="type") private Integer type; @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") private String couponIds; @@ -71,7 +72,7 @@ public class WxCampaign extends BaseEntity { private Date createTime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; - @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") + @io.swagger.annotations.ApiModelProperty(value="富文本,类型2适用",name="html") private String html; @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") @@ -91,6 +92,15 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType") private Integer activityType; + @io.swagger.annotations.ApiModelProperty(value = "产品类型,类型3适用(1-券,2-报名)", name = "produceType") + private Integer produceType; + @io.swagger.annotations.ApiModelProperty(value = "产品ID,类型3适用", name = "produceId") + private Long produceId; + @io.swagger.annotations.ApiModelProperty(value = "小程序跳转路径,类型3适用", name = "pagePath") + private String pagePath; + @io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene") + private String pageScene; + @Transient @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") protected Date starttime; @@ -100,22 +110,28 @@ public class WxCampaign extends BaseEntity { protected Date endtime; @Transient - @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") + @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath") protected String weappPath; @Transient - @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") + @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序二维码Scene",name="weappScene") protected String weappScene; public String getWeappPath() { if(type == null) return "pages/index/index"; + if(type.equals(EnumCampaignType.PAGEPATH.getCode())) { + return pagePath; + } return "pages/index/index?type=bd&bt="+type+"&id="+id; } public String getWeappScene() { if(type == null) return ""; + if(type.equals(EnumCampaignType.PAGEPATH.getCode())) { + return pageScene; + } return "t:bd:" + type + ":" +id; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java index c2fb035cb..9509194f6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCampaignType.java @@ -7,6 +7,7 @@ public enum EnumCampaignType { STABLE(1, "固定格式"), FREE(2, "自由图文"), + PAGEPATH(3, "小程序路径"), ; public static EnumCampaignType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index 691d0138f..bc50f1794 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -10,43 +10,53 @@ public interface WxCampaignService { /** * 根据实体查询分页列表 + * * @param record * @param pageIndex * @param pageSize * @return */ - PageInfo listAsPage(WxCampaign record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCampaign record, Integer pageIndex, Integer pageSize); /** * 根据实体查询分页列表 + * * @param record * @param pageIndex * @param pageSize * @return */ PageInfo clistAsPage(WxCampaign record, Integer pageIndex, Integer pageSize); - - /** + + /** * 根据Id获得实体 * * @param id * @return */ WxCampaign getById(Long id); - - /** + + /** * 保存或更新实体 * - * @param record - */ + * @param record + */ ResultData saveOrUpdate(WxCampaign record); + /** + * 基于小程序路径发布 + * @param wxCampaign + * @return + */ + ResultData addForPath(WxCampaign wxCampaign); + /** * 根据Id删除实体 * * @param id */ void deleteById(Long id); + int getMaxSortNum(String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index ff96353fa..9dd29b408 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -89,7 +89,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { if (StringUtils.isEmpty(wxCampaign.getDetail())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "活动说明不能为空"); } - } else { + } else if(wxCampaign.getType().equals(EnumCampaignType.FREE.getCode())){ if (StringUtils.isEmpty(wxCampaign.getHtml())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "图文不能为空"); } @@ -97,6 +97,43 @@ public class WxCampaignServiceImpl implements WxCampaignService { if (length >= 0xFFFFFF) { //Mysql MiddleText length limited return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "图文内容过大无法保存"); } + } else { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + if (wxCampaign.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + wxCampaign.setId(idWorker.nextId()); + wxCampaignMapper.insertSelective(wxCampaign); + } else { + wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); + } + //type 为固定格式才会有券的信息 才会有投放的问题 + couponInject(wxCampaign); + return new ResultData(Result.SUCCESS,"操作成功"); + } + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) + @Override + public ResultData addForPath(WxCampaign wxCampaign) { + if(wxCampaign.getType().equals(EnumCampaignType.PAGEPATH.getCode())) { + if (StringUtils.isBlank(wxCampaign.getCoverImg())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空"); + } + if (wxCampaign.getProduceType() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "produceType不能为空"); + } + if (wxCampaign.getProduceId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "produceId不能为空"); + } + if (StringUtils.isBlank(wxCampaign.getPagePath())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "pagePath不能为空"); + } + if (StringUtils.isBlank(wxCampaign.getPageScene())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "pageScene不能为空"); + } + } else { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); if (wxCampaign.getId() == null) { From 1cf202b36ba858f0d93a004113fcd43a1ac175fa Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:33:32 +0800 Subject: [PATCH 052/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906051712__ADD_MENU.sql | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql new file mode 100644 index 000000000..ac7a02fbf --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql @@ -0,0 +1,32 @@ +INSERT INTO `mall_permission` + (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) +VALUES + (903, '审批管理', 7, 'Y', null, 1, null, null, null, 'icon-shenpiguanli', 0, 903), + (931, '流程模板', 7, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), + (932, '类型设置', 7, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 931); + +DROP TABLE IF EXISTS `mall_sale_type` ; +CREATE TABLE `mall_sale_type` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '销售类型', + `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', + `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', + `menus` json DEFAULT NULL COMMENT '菜单列表', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_sale_type` + (`id`,`name`, `type`, `period`, `menus`) +VALUES + (1, '尊享全能版', 1, 12, + '[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]' + ), + (2, '尊享营销版', 2, 12, + '[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]' + ), + (3, '速享版', 3, 1, + '[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932]' + ) + + ; \ No newline at end of file From c897007c3ba071d241cba10532fd6944ff5e7ab8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:35:46 +0800 Subject: [PATCH 053/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201906051712__ADD_MENU.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql index ac7a02fbf..80eaba9c9 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql @@ -2,8 +2,8 @@ INSERT INTO `mall_permission` (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) VALUES (903, '审批管理', 7, 'Y', null, 1, null, null, null, 'icon-shenpiguanli', 0, 903), - (931, '流程模板', 7, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), - (932, '类型设置', 7, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 931); + (931, '流程模板', 903, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), + (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 931); DROP TABLE IF EXISTS `mall_sale_type` ; CREATE TABLE `mall_sale_type` ( From 357fc51299f2c8e78a09594216494ba308d85d13 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:37:48 +0800 Subject: [PATCH 054/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V201906051712__ADD_MENU.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql index 80eaba9c9..769a74420 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql @@ -3,7 +3,7 @@ INSERT INTO `mall_permission` VALUES (903, '审批管理', 7, 'Y', null, 1, null, null, null, 'icon-shenpiguanli', 0, 903), (931, '流程模板', 903, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), - (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 931); + (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 932); DROP TABLE IF EXISTS `mall_sale_type` ; CREATE TABLE `mall_sale_type` ( From 44a77e1d68b7e6bddf622a81bff6b048c28c66a2 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:38:36 +0800 Subject: [PATCH 055/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V201906051712__ADD_MENU.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql index 769a74420..30793d6f4 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql @@ -3,7 +3,7 @@ INSERT INTO `mall_permission` VALUES (903, '审批管理', 7, 'Y', null, 1, null, null, null, 'icon-shenpiguanli', 0, 903), (931, '流程模板', 903, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), - (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', 'icon-shenpiguanli', 0, 932); + (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', null, 0, 932); DROP TABLE IF EXISTS `mall_sale_type` ; CREATE TABLE `mall_sale_type` ( From 399be396dd9a1c124811ad794dc6b5850d082120 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 17:41:26 +0800 Subject: [PATCH 056/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V201906051712__ADD_MENU.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql index 30793d6f4..dde8f8c7e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql @@ -1,7 +1,7 @@ INSERT INTO `mall_permission` (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) VALUES - (903, '审批管理', 7, 'Y', null, 1, null, null, null, 'icon-shenpiguanli', 0, 903), + (903, '审批管理', 7, 'Y', null, 0, null, null, null, 'icon-shenpiguanli', 0, 903), (931, '流程模板', 903, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931), (932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', null, 0, 932); From 89a82b833b0d4c8d121a18cee9c9d8845be6e810 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 17:50:35 +0800 Subject: [PATCH 057/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=96=B0=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=92=8C=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E6=B4=BB=E5=8A=A8=E5=8F=82=E5=8A=A0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ler.java => WxActivityJoinController.java} | 70 ++++---- .../V201906051755__ADD_ACTIVITY_TABLE.sql | 25 +++ ...ginSchedule.java => ActivitySchedule.java} | 68 ++++---- .../com/iformall/domain/po/WxActivity.java | 158 ++++++++++++++++++ ...xCampaignJoin.java => WxActivityJoin.java} | 11 +- .../com/iformall/domain/po/WxCampaign.java | 25 --- ...nExpired.java => EnumActivityExpired.java} | 8 +- ...s.java => EnumActivityJoinSignStatus.java} | 8 +- ...tatus.java => EnumActivityJoinStatus.java} | 8 +- .../iformall/enums/EnumActivityStatus.java | 37 ++++ .../iformall/mapper/WxActivityJoinMapper.java | 12 ++ .../com/iformall/mapper/WxActivityMapper.java | 20 +++ .../iformall/mapper/WxCampaignJoinMapper.java | 12 -- .../service/WxActivityJoinService.java | 25 +++ .../service/WxCampaignJoinService.java | 25 --- ...pl.java => WxActivityJoinServiceImpl.java} | 58 +++---- ...oinMapper.xml => WxActivityJoinMapper.xml} | 10 +- .../resources/mapper/WxActivityMapper.xml | 114 +++++++++++++ .../resources/mapper/WxCampaignMapper.xml | 44 +---- 19 files changed, 515 insertions(+), 223 deletions(-) rename mallinkAdmin/src/main/java/com/iformall/controller/market/{WxCampaignJoinController.java => WxActivityJoinController.java} (54%) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051755__ADD_ACTIVITY_TABLE.sql rename mallinkSchedule/src/main/java/com/iformall/schedule/{CampaginSchedule.java => ActivitySchedule.java} (53%) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java rename mallinkService/src/main/java/com/iformall/domain/po/{WxCampaignJoin.java => WxActivityJoin.java} (95%) rename mallinkService/src/main/java/com/iformall/enums/{EnumCampaignExpired.java => EnumActivityExpired.java} (70%) rename mallinkService/src/main/java/com/iformall/enums/{EnumCampaignJoinSignStatus.java => EnumActivityJoinSignStatus.java} (68%) rename mallinkService/src/main/java/com/iformall/enums/{EnumCampaignJoinStatus.java => EnumActivityJoinStatus.java} (72%) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java delete mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java delete mode 100644 mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java rename mallinkService/src/main/java/com/iformall/service/impl/{WxCampaignJoinServiceImpl.java => WxActivityJoinServiceImpl.java} (63%) rename mallinkService/src/main/resources/mapper/{WxCampaignJoinMapper.xml => WxActivityJoinMapper.xml} (88%) create mode 100644 mallinkService/src/main/resources/mapper/WxActivityMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java similarity index 54% rename from mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 7df0b85ff..58bde729f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -5,9 +5,9 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.domain.po.WxActivityJoin; import com.iformall.exception.MallinkException; -import com.iformall.service.WxCampaignJoinService; +import com.iformall.service.WxActivityJoinService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -24,13 +24,13 @@ import javax.servlet.http.HttpServletResponse; * @author gongbiao */ @RestController -@RequestMapping("wxCampaignJoin") +@RequestMapping("wxActivityJoin") @Api(description = "活动参与信息") -public class WxCampaignJoinController extends BaseController { +public class WxActivityJoinController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxCampaignJoinService wxCampaignJoinService; + private WxActivityJoinService wxActivityJoinService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -38,68 +38,70 @@ public class WxCampaignJoinController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "活动参与信息-列表") - public ResultData list(@ModelAttribute WxCampaignJoin wxCampaignJoin, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::list"); - if (null == wxCampaignJoin) wxCampaignJoin = new WxCampaignJoin(); - wxCampaignJoin.setTenantId(getTenantId()); - wxCampaignJoin.setSortColumns(WxCampaignJoin.Field.Id_DESC); - final PageInfo page = wxCampaignJoinService.listAsPage(wxCampaignJoin, pageNum, pageSize); + public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxActivityJoinController::list"); + if (null == wxActivityJoin) { + wxActivityJoin = new WxActivityJoin(); + } + wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.setSortColumns(WxActivityJoin.Field.Id_DESC); + final PageInfo page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize); return new ResultData(page); } @ApiOperation("确认或取消报名") @PostMapping("modifyStatus") @SystemControllerLog(description = "活动参与信息-确认或取消报名") - public ResultData modifyStatus(@RequestBody WxCampaignJoin wxCampaignJoin) { - logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::modifyStatus"); + public ResultData modifyStatus(@RequestBody WxActivityJoin wxActivityJoin) { + logger.debug("[" + getIpAddr() + "] WxActivityJoinController::modifyStatus"); - if (wxCampaignJoin.getId() == null) { + if (wxActivityJoin.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } - if (wxCampaignJoin.getStatus() == null) { + if (wxActivityJoin.getStatus() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); } - return wxCampaignJoinService.modifyStatus(wxCampaignJoin); + return wxActivityJoinService.modifyStatus(wxActivityJoin); } @ApiOperation("导出报名表") @RequestMapping("/exportData") @SystemControllerLog(description = "活动参与信息-导出报名表") - public void exportData(@ModelAttribute WxCampaignJoin wxCampaignJoin, HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::exportData"); - if (wxCampaignJoin.getCampaignId() == null) { - throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + public void exportData(@ModelAttribute WxActivityJoin wxActivityJoin, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxActivityJoinController::exportData"); + if (wxActivityJoin.getActivityId() == null) { + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxCampaignJoin.setTenantId(getTenantId()); - wxCampaignJoinService.exportData(request, response, wxCampaignJoin); + wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoinService.exportData(request, response, wxActivityJoin); } @ApiOperation("查询报名总数") @GetMapping("queryJoinInfo") @SystemControllerLog(description = "活动参与信息-查询报名总数") - public ResultData queryJoinInfo(@ModelAttribute WxCampaignJoin wxCampaignJoin) { - logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::queryJoinInfo"); + public ResultData queryJoinInfo(@ModelAttribute WxActivityJoin wxActivityJoin) { + logger.debug("[" + getIpAddr() + "] WxActivityJoinController::queryJoinInfo"); - if (wxCampaignJoin.getCampaignId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxCampaignJoin.setTenantId(getTenantId()); - return wxCampaignJoinService.queryJoinInfo(wxCampaignJoin); + wxActivityJoin.setTenantId(getTenantId()); + return wxActivityJoinService.queryJoinInfo(wxActivityJoin); } @ApiOperation("发送短信") @GetMapping("sendMsg") @SystemControllerLog(description = "活动参与信息-发送短信") - public ResultData sendMsg(@ModelAttribute WxCampaignJoin wxCampaignJoin) { - logger.debug("[" + getIpAddr() + "] WxCampaignJoinController::confirmCompletion"); + public ResultData sendMsg(@ModelAttribute WxActivityJoin wxActivityJoin) { + logger.debug("[" + getIpAddr() + "] WxActivityJoinController::confirmCompletion"); - if (wxCampaignJoin.getCampaignId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "campaignId不能为空"); + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } - wxCampaignJoin.setTenantId(getTenantId()); - return wxCampaignJoinService.sendMsg(wxCampaignJoin); + wxActivityJoin.setTenantId(getTenantId()); + return wxActivityJoinService.sendMsg(wxActivityJoin); } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051755__ADD_ACTIVITY_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051755__ADD_ACTIVITY_TABLE.sql new file mode 100644 index 000000000..06e367fa4 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051755__ADD_ACTIVITY_TABLE.sql @@ -0,0 +1,25 @@ +drop table if exists `wx_activity`; +CREATE TABLE IF NOT EXISTS `wx_activity` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `cover_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '封面图', + `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动名称', + `sub_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '副标题', + `detail` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '活动正文', + `html` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '富文本', + `person_limit` int(11) NOT NULL COMMENT '报名人数', + `activity_start_time` datetime NOT NULL COMMENT '活动开始时间', + `activity_end_time` datetime NOT NULL COMMENT '活动开始时间', + `useCredit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', + `credit` int(11) DEFAULT 0 COMMENT '消耗积分', + `type` smallint(2) NOT NULL COMMENT '类型 1固定格式2自由图文', + `status` smallint(2) NOT NULL COMMENT '状态0上线 1下线', + `start_time` datetime NOT NULL COMMENT '活动报名开始时间', + `end_time` datetime NOT NULL COMMENT '活动报名结束时间', + `question` json NOT NULL COMMENT '问题', + `is_expired` smallint(2) DEFAULT 1 COMMENT '是否过期1是0否', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动表' CHECKSUM=0 DELAY_KEY_WRITE=0; \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java similarity index 53% rename from mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java rename to mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 50773b1f7..bbf033367 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CampaginSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -1,11 +1,11 @@ package com.iformall.schedule; -import com.iformall.domain.po.WxCampaign; -import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.enums.*; -import com.iformall.mapper.WxCampaignJoinMapper; -import com.iformall.mapper.WxCampaignMapper; +import com.iformall.mapper.WxActivityJoinMapper; +import com.iformall.mapper.WxActivityMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.utils.DateUtils; import org.apache.commons.collections.map.HashedMap; @@ -23,15 +23,15 @@ import java.util.Map; * @author gongbiao */ @Component -public class CampaginSchedule { +public class ActivitySchedule { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxCampaignMapper wxCampaignMapper; + private WxActivityMapper wxActivityMapper; @Autowired - private WxCampaignJoinMapper wxCampaignJoinMapper; + private WxActivityJoinMapper wxActivityJoinMapper; @Autowired private MqBaseProducer mqBaseProducer; @@ -42,34 +42,34 @@ public class CampaginSchedule { @Scheduled(cron = "0 0 12 * * ?") public void sendMsg() { logger.info("限时活动参与提醒任务启动"); - WxCampaign wxCampaign = new WxCampaign(); - wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - List wxCampaigns = wxCampaignMapper.queryNotify(wxCampaign); - WxCampaignJoin wxCampaignJoin = null; - for (WxCampaign campaign : wxCampaigns) { - wxCampaignJoin = new WxCampaignJoin(); - wxCampaignJoin.setTenantId(campaign.getTenantId()); - wxCampaignJoin.setCampaignId(campaign.getId()); - wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); - List list = wxCampaignJoinMapper.findList(wxCampaignJoin); - for (WxCampaignJoin campaignJoin : list) { - send(campaign, campaignJoin); + WxActivity wxActivity = new WxActivity(); + wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + List wxActivitys = wxActivityMapper.queryNotify(wxActivity); + WxActivityJoin wxActivityJoin = null; + for (WxActivity activity : wxActivitys) { + wxActivityJoin = new WxActivityJoin(); + wxActivityJoin.setTenantId(activity.getTenantId()); + wxActivityJoin.setActivityId(activity.getId()); + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + List list = wxActivityJoinMapper.findList(wxActivityJoin); + for (WxActivityJoin activityJoin : list) { + send(activity, activityJoin); } } } - private void send(WxCampaign campaign, WxCampaignJoin campaignJoin) { + private void send(WxActivity activity, WxActivityJoin activityJoin) { logger.info("限时活动参与提醒短信发送开始"); - String phone = campaignJoin.getPhone(); - String person = campaignJoin.getName(); + String phone = activityJoin.getPhone(); + String person = activityJoin.getName(); person = StringUtils.isNotEmpty(person) ? person : ""; - String time = DateUtils.date2String(campaign.getActivityStartTime()); - String party = campaign.getTitle(); + String time = DateUtils.date2String(activity.getActivityStartTime()); + String party = activity.getTitle(); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode()); wxMsgRecord.setReceiver(phone); - wxMsgRecord.setTenantId(campaignJoin.getTenantId()); + wxMsgRecord.setTenantId(activityJoin.getTenantId()); Map map = new HashedMap(); map.put("person", person); map.put("party", party); @@ -84,23 +84,23 @@ public class CampaginSchedule { * 5分钟一次 */ @Scheduled(cron = "0 */5 * * * ?") - public void campaignExipred() { + public void activityExipred() { logger.info("活动报名结束任务"); - WxCampaign campaign = new WxCampaign(); - campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - campaign.setIsExpired(EnumCampaignExpired.YES.getCode()); - wxCampaignMapper.campaignExipred(campaign); + WxActivity activity = new WxActivity(); + activity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + activity.setIsExpired(EnumActivityExpired.YES.getCode()); + wxActivityMapper.activityExipred(activity); } /** * 5分钟一次 */ @Scheduled(cron = "0 */5 * * * ?") - public void campaignCompletion() { + public void activityCompletion() { logger.info("活动结束任务"); - WxCampaign campaign = new WxCampaign(); - campaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); - wxCampaignMapper.campaignCompletion(campaign); + WxActivity activity = new WxActivity(); + activity.setStatus(EnumActivityStatus.STATUS_TAKE_OFFF.getCode()); + wxActivityMapper.activityCompletion(activity); } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java new file mode 100644 index 000000000..767763718 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -0,0 +1,158 @@ +package com.iformall.domain.po; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_activity") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxActivity extends BaseEntity { + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") + private String tenantId; + @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") + private String coverImg; + @io.swagger.annotations.ApiModelProperty(value = "主标题", name = "title") + private String title; + @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "subTitle") + private String subTitle; + @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") + private Integer useCredit; + @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") + private Integer credit; + @io.swagger.annotations.ApiModelProperty(value = "活动人数", name = "personLimit") + private Integer personLimit; + @io.swagger.annotations.ApiModelProperty(value = "活动正文", name = "detail") + private String detail; + @io.swagger.annotations.ApiModelProperty(value = "活动开始报名时间", name = "startTime") + private Date startTime; + @io.swagger.annotations.ApiModelProperty(value = "活动结束报名时间", name = "endTime") + private Date endTime; + @io.swagger.annotations.ApiModelProperty(value = "类型 1固定格式2自由图文", name = "type") + private Integer type; + @io.swagger.annotations.ApiModelProperty(value = "0上线 1下线", name = "status") + private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") + private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "富文本", name = "html") + private String html; + @io.swagger.annotations.ApiModelProperty(value = "问题", name = "question") + private String question; + + @io.swagger.annotations.ApiModelProperty(value = "是否过期1是0否", name = "isExpired") + private Integer isExpired; + + @io.swagger.annotations.ApiModelProperty(value = "活动开始时间", name = "activityStartTime") + private Date activityStartTime; + @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") + private Date activityEndTime; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") + protected Date starttime; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") + protected Date endtime; + + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "小程序路径", name = "weappPath") + protected String weappPath; + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "小程序二维码Scene", name = "weappScene") + protected String weappScene; + + public String getWeappPath() { + if (type == null) + return "pages/index/index"; + return "pages/index/index?type=bd&bt=" + type + "&id=" + id; + } + + public String getWeappScene() { + if (type == null) + return ""; + return "t:bd:" + type + ":" + id; + } + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_start_time` ASC"), ActivityTime_DESC("`activity_start_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(WxActivity.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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + 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/iformall/domain/po/WxCampaignJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java similarity index 95% rename from mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java rename to mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 826a8b7c3..8f4a58bd7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaignJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -11,11 +11,11 @@ import javax.persistence.Transient; import java.util.Date; import java.util.List; -@Table(name = "wx_campaign_join") +@Table(name = "wx_activity_join") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCampaignJoin extends BaseEntity { +public class WxActivityJoin extends BaseEntity { @Id protected Long id; @@ -36,8 +36,8 @@ public class WxCampaignJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "C端用户ID", name = "userId") private Long userId; - @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "campaignId") - private Long campaignId; + @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "activityId") + private Long activityId; @Excel(name = "姓名", width = 10, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "姓名", name = "name") @@ -99,7 +99,7 @@ public class WxCampaignJoin extends BaseEntity { } } - public void setSortColumns(WxCampaignJoin.Field... fields) { + public void setSortColumns(WxActivityJoin.Field... fields) { if (fields == null || fields.length == 0) { return; } @@ -116,6 +116,7 @@ public class WxCampaignJoin extends BaseEntity { this.sortColumns = sb.toString(); } + @Override public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { return; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index e630aaa1a..46a2993ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -75,23 +75,6 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="富文本,类型2适用",name="html") private String html; - @io.swagger.annotations.ApiModelProperty(value = "报名人数", name = "personLimit") - private Integer personLimit; - @io.swagger.annotations.ApiModelProperty(value = "活动开始时间", name = "activityStartTime") - private Date activityStartTime; - @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") - private Date activityEndTime; - @io.swagger.annotations.ApiModelProperty(value = "使用积分1是0否", name = "useCredit") - private Integer useCredit; - @io.swagger.annotations.ApiModelProperty(value = "消耗积分", name = "credit") - private Integer credit; - @io.swagger.annotations.ApiModelProperty(value = "问题", name = "question") - private String question; - @io.swagger.annotations.ApiModelProperty(value = "是否过期1是0否", name = "isExpired") - private Integer isExpired; - @io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType") - private Integer activityType; - @io.swagger.annotations.ApiModelProperty(value = "产品类型,类型3适用(1-券,2-报名)", name = "produceType") private Integer produceType; @io.swagger.annotations.ApiModelProperty(value = "产品ID,类型3适用", name = "produceId") @@ -101,14 +84,6 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "小程序跳转二维码,类型3适用", name = "pageScene") private String pageScene; - @Transient - @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") - protected Date starttime; - - @Transient - @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") - protected Date endtime; - @Transient @io.swagger.annotations.ApiModelProperty(value="营销物料-小程序路径",name="weappPath") protected String weappPath; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityExpired.java similarity index 70% rename from mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java rename to mallinkService/src/main/java/com/iformall/enums/EnumActivityExpired.java index e69b07c82..f05e521c7 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignExpired.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityExpired.java @@ -3,14 +3,14 @@ package com.iformall.enums; /** * Created by Stormeye on 2018/08/09. */ -public enum EnumCampaignExpired { +public enum EnumActivityExpired { YES(1, "过期"), NO(0, "未到期"),; - public static EnumCampaignExpired getEnum(Integer code) { - for (EnumCampaignExpired value : values()) { + public static EnumActivityExpired getEnum(Integer code) { + for (EnumActivityExpired value : values()) { if (value.getCode().equals(code)) { return value; } @@ -21,7 +21,7 @@ public enum EnumCampaignExpired { private Integer code; private String message; - EnumCampaignExpired(Integer code, String message) { + EnumActivityExpired(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinSignStatus.java similarity index 68% rename from mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinSignStatus.java index 02e982f5d..4d568a777 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinSignStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinSignStatus.java @@ -4,13 +4,13 @@ package com.iformall.enums; /** * @author gongbiao */ -public enum EnumCampaignJoinSignStatus { +public enum EnumActivityJoinSignStatus { YES(1, "签到"), NO(0, "未签到"),; - public static EnumCampaignJoinSignStatus getEnum(Integer code) { - for (EnumCampaignJoinSignStatus value : values()) { + public static EnumActivityJoinSignStatus getEnum(Integer code) { + for (EnumActivityJoinSignStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -21,7 +21,7 @@ public enum EnumCampaignJoinSignStatus { private Integer code; private String message; - EnumCampaignJoinSignStatus(Integer code, String message) { + EnumActivityJoinSignStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinStatus.java similarity index 72% rename from mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinStatus.java index f291561a1..fcb395c6c 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCampaignJoinStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityJoinStatus.java @@ -4,15 +4,15 @@ package com.iformall.enums; /** * @author gongbiao */ -public enum EnumCampaignJoinStatus { +public enum EnumActivityJoinStatus { NOT_CONFIRMED(0, "未确认"), CONFIRMED(1, "已确认"), CANCEL(2, "已取消"), EXPIRED(3, "活动过期"),; - public static EnumCampaignJoinStatus getEnum(Integer code) { - for (EnumCampaignJoinStatus value : values()) { + public static EnumActivityJoinStatus getEnum(Integer code) { + for (EnumActivityJoinStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -23,7 +23,7 @@ public enum EnumCampaignJoinStatus { private Integer code; private String message; - EnumCampaignJoinStatus(Integer code, String message) { + EnumActivityJoinStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java new file mode 100644 index 000000000..86f3ed7ed --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumActivityStatus { + + // 0-已上架;1-已下架; + + STATUS_THROW_IN(0, "已上架"), + STATUS_TAKE_OFFF(1, "已下架"),; + + public static EnumActivityStatus getEnum(Integer code) { + for (EnumActivityStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumActivityStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java new file mode 100644 index 000000000..1d6583c2f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -0,0 +1,12 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxActivityJoin; + +import java.util.List; + +public interface WxActivityJoinMapper extends CommonMapper { + + List findList(WxActivityJoin params); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java new file mode 100644 index 000000000..14316d486 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxActivity; + +import java.util.List; + +/** + * @author gongbiao + */ +public interface WxActivityMapper extends CommonMapper { + + List findList(WxActivity wxActivity); + + List queryNotify(WxActivity wxActivity); + + void activityExipred(WxActivity activity); + + void activityCompletion(WxActivity activity); +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java deleted file mode 100644 index fba49dd7c..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignJoinMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iformall.mapper; - -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.WxCampaignJoin; - -import java.util.List; - -public interface WxCampaignJoinMapper extends CommonMapper { - - List findList(WxCampaignJoin params); - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java new file mode 100644 index 000000000..0e13e825d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java @@ -0,0 +1,25 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxActivityJoin; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author gongbiao + */ +public interface WxActivityJoinService { + + PageInfo listAsPage(WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize); + + ResultData modifyStatus(WxActivityJoin wxActivityJoin); + + void exportData(HttpServletRequest request, HttpServletResponse response, WxActivityJoin wxActivityJoin); + + ResultData queryJoinInfo(WxActivityJoin wxActivityJoin); + + ResultData sendMsg(WxActivityJoin wxActivityJoin); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java deleted file mode 100644 index d7bcf9423..000000000 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignJoinService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCampaignJoin; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author gongbiao - */ -public interface WxCampaignJoinService { - - PageInfo listAsPage(WxCampaignJoin wxCampaignJoin, Integer pageNum, Integer pageSize); - - ResultData modifyStatus(WxCampaignJoin wxCampaignJoin); - - void exportData(HttpServletRequest request, HttpServletResponse response, WxCampaignJoin wxCampaignJoin); - - ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin); - - ResultData sendMsg(WxCampaignJoin wxCampaignJoin); - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java similarity index 63% rename from mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java rename to mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 8de9cc1f3..b10002f67 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -4,16 +4,16 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCampaign; -import com.iformall.domain.po.WxCampaignJoin; +import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.*; -import com.iformall.mapper.WxCampaignJoinMapper; -import com.iformall.mapper.WxCampaignMapper; +import com.iformall.mapper.WxActivityJoinMapper; +import com.iformall.mapper.WxActivityMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.ExcelService; -import com.iformall.service.WxCampaignJoinService; +import com.iformall.service.WxActivityJoinService; import com.iformall.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -31,14 +31,14 @@ import java.util.Map; * @author gongbiao */ @Service -public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { +public class WxActivityJoinServiceImpl implements WxActivityJoinService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - WxCampaignJoinMapper wxCampaignJoinMapper; + WxActivityJoinMapper wxActivityJoinMapper; @Autowired - WxCampaignMapper wxCampaignMapper; + WxActivityMapper wxActivityMapper; @Autowired ExcelService excelService; @@ -47,34 +47,34 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { private MqBaseProducer mqBaseProducer; @Override - public PageInfo listAsPage(WxCampaignJoin record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCampaignJoinMapper.findList(record)); + public PageInfo listAsPage(WxActivityJoin record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityJoinMapper.findList(record)); } @Override - public ResultData modifyStatus(WxCampaignJoin wxCampaignJoin) { - wxCampaignJoinMapper.updateByPrimaryKeySelective(wxCampaignJoin); + public ResultData modifyStatus(WxActivityJoin wxActivityJoin) { + wxActivityJoinMapper.updateByPrimaryKeySelective(wxActivityJoin); return new ResultData(Result.SUCCESS, "操作成功"); } @Override - public void exportData(HttpServletRequest request, HttpServletResponse response, WxCampaignJoin wxCampaignJoin) { - WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); - String title = wxCampaign.getTitle(); - List list = wxCampaignJoinMapper.findList(wxCampaignJoin); + public void exportData(HttpServletRequest request, HttpServletResponse response, WxActivityJoin wxActivityJoin) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + String title = wxActivity.getTitle(); + List list = wxActivityJoinMapper.findList(wxActivityJoin); excelService.exportExcel(list, null, title, WxBillDailyVo.class, "报名表.xlsx", response, false); } @Override - public ResultData queryJoinInfo(WxCampaignJoin wxCampaignJoin) { - WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); + public ResultData queryJoinInfo(WxActivityJoin wxActivityJoin) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); //活动人数 - Integer personLimit = wxCampaign.getPersonLimit(); + Integer personLimit = wxActivity.getPersonLimit(); //总人数 - int total = wxCampaignJoinMapper.selectCount(wxCampaignJoin); - wxCampaignJoin.setStatus(EnumCampaignJoinStatus.CONFIRMED.getCode()); + int total = wxActivityJoinMapper.selectCount(wxActivityJoin); + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); //确认数 - int confirm = wxCampaignJoinMapper.selectCount(wxCampaignJoin); + int confirm = wxActivityJoinMapper.selectCount(wxActivityJoin); Map data = new HashMap<>(); data.put("personLimit", personLimit); data.put("confirm", confirm); @@ -83,16 +83,16 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { } @Override - public ResultData sendMsg(WxCampaignJoin wxCampaignJoin) { - WxCampaign campaign = wxCampaignMapper.selectByPrimaryKey(wxCampaignJoin.getCampaignId()); - List joinList = wxCampaignJoinMapper.select(wxCampaignJoin); - for (WxCampaignJoin join : joinList) { + public ResultData sendMsg(WxActivityJoin wxActivityJoin) { + WxActivity campaign = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + List joinList = wxActivityJoinMapper.select(wxActivityJoin); + for (WxActivityJoin join : joinList) { sendMessage(join, campaign); } return new ResultData(); } - private void sendMessage(WxCampaignJoin join, WxCampaign campaign) { + private void sendMessage(WxActivityJoin join, WxActivity activity) { logger.info("》》》》》》》》》》》"); logger.info("活动发送短信开始"); logger.info("》》》》》》》》》》》"); @@ -102,8 +102,8 @@ public class WxCampaignJoinServiceImpl implements WxCampaignJoinService { //找出用户手机号 String phone = join.getPhone(); //活动名 - String party = campaign.getTitle(); - String time = DateUtils.date2String(campaign.getActivityStartTime()); + String party = activity.getTitle(); + String time = DateUtils.date2String(activity.getActivityStartTime()); Map msgReplaceMap = new HashMap(); msgReplaceMap.put("person", person); msgReplaceMap.put("party", party); diff --git a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml similarity index 88% rename from mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml rename to mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 8e433e0ca..b95708bda 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -1,11 +1,11 @@ - - + + - + @@ -22,7 +22,7 @@ - `id`,`tenant_id`,`user_id`,`campaign_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, + `id`,`tenant_id`,`user_id`,`activity_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url` @@ -63,7 +63,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml new file mode 100644 index 000000000..255012e55 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, + `useCredit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`, + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + + and `title` like concat('%', #{title},'%') + + + + and `sub_title` like concat('%', #{subTitle},'%') + + + + and `detail` like concat('%', #{detail},'%') + + + + and `type` = #{type} + + + + and `status` = #{status} + + + + and `create_time` = #{createTime} + + + + and `update_time` = #{updateTime} + + + + and `use_credit` = #{useCredit} + + + and `is_expired` = #{isExpired} + + + + and `create_time` between #{starttime} and #{endtime} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + update wx_activity set is_expired=${isExpired} where status=${status} and now()>end_time + + + + update wx_activity set status#{status} where status!=${status} and now()>activity_end_time + + + + diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index d774fc889..b398daf32 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -22,22 +22,11 @@ - - - - - - - - - - - + `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, - `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, - `person_limit`,`activity_start_time`,`activity_end_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type` + `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` @@ -124,21 +113,6 @@ and `update_time` = #{updateTime} - - - and `use_credit` = #{useCredit} - - - and `is_expired` = #{isExpired} - - - and `activity_type` = #{activityType} - - - - and `create_time` between #{starttime} and #{endtime} - - and id in @@ -165,19 +139,5 @@ - - - - - update wx_campaign set is_expired=${isExpired} where status=${status} and now()>valid_end_date - - - - update wx_campaign set status=#{status} where status!=${status} and now()>activity_end_time - - From d6da1fe2c9723478f9d231b15a4226d1879ddf77 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Jun 2019 17:58:19 +0800 Subject: [PATCH 058/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B4=BB=E5=8A=A8mapper.xml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 2 +- .../src/main/resources/mapper/WxActivityMapper.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index b95708bda..29de895c2 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -60,7 +60,7 @@ order by ${sortColumns} - select from wx_activity_join diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 255012e55..1d26b2c95 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -89,7 +89,7 @@ order by ${sortColumns} - select from wx_activity @@ -97,16 +97,16 @@ - select id,title,activity_start_time,tenant_id from wx_activity where status=${status} and DATEDIFF(activity_start_time,now())=3 - + update wx_activity set is_expired=${isExpired} where status=${status} and now()>end_time - + update wx_activity set status#{status} where status!=${status} and now()>activity_end_time From 7ae6bc84d38518ad96e1815f904ee8a630ad6724 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 18:18:10 +0800 Subject: [PATCH 059/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 16 +++++++ .../V201906051753__L_ALTER_COUPON.sql | 2 + .../java/com/iformall/domain/po/WxCoupon.java | 3 ++ .../com/iformall/domain/vo/UserTaskVo.java | 42 +++++++++++++++++++ .../service/impl/WxFlowServiceImpl.java | 7 ++-- .../main/resources/mapper/WxCouponMapper.xml | 3 +- 6 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index d96d310da..3ffee76dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -7,15 +7,19 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; +import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +35,8 @@ public class WxCouponController extends BaseController { @Autowired private WxCouponService wxCouponService; + @Autowired + private WxCouponChannelMapper wxCouponChannelMapper; @ApiOperation("分页列表接口") @GetMapping("list") @@ -61,6 +67,16 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } + if(wxCoupon.getIsDel().equals(1)){ + WxCouponChannel query = new WxCouponChannel(); + query.setTenantId(wxCoupon.getTenantId()); + query.setCouponId(wxCoupon.getId()); + query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + if(CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))){ + return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); + } + } + wxCoupon.setTenantId(getTenantId()); return wxCouponService.saveOrUpdate(wxCoupon); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql new file mode 100644 index 000000000..288b7d59c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql @@ -0,0 +1,2 @@ +alter table wx_coupon +add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index cab74561e..971213ab9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -194,6 +194,9 @@ public class WxCoupon extends BaseEntity { @Transient private Integer pressSuccCount; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + public String getSalePriceStr() { if(salePrice!=null) { salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java new file mode 100644 index 000000000..19005f321 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java @@ -0,0 +1,42 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class UserTaskVo implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String name; + + private List userList; + + //1普通 2会签 3或签 + private Integer type; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getUserList() { + return userList; + } + + public void setUserList(List userList) { + this.userList = userList; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index fdd38381a..4bd15cce8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -20,6 +20,7 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.bpmn.model.BpmnModel; +import org.flowable.bpmn.model.UserTask; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; @@ -117,7 +118,7 @@ public class WxFlowServiceImpl implements WxFlowService { contractType = Integer.parseInt(str); } - if(1 == flowType){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType)){ // 1租赁合同 2点位合同 3物业 4点位物业合同 if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); @@ -142,7 +143,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContractService.updatePropertyContractStatus(businessId); } } - }else if(3 == flowType){ + }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType)){ if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); rent.setId(businessId); @@ -189,7 +190,7 @@ public class WxFlowServiceImpl implements WxFlowService { } wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); } - } else if (2 == flowType) { + } else if (EnumFlowKey.BILL.getCode().equals(flowType)) { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { //账单审批 Integer billType = (Integer) getVariableByKey(variables, "billType"); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index f131cf946..a4839de82 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -37,6 +37,7 @@ + @@ -263,7 +264,7 @@ - where 1 = 1 + where is_del = 0 and 0 = (select count(*) from wx_coupon_channel cc where c.`id` = cc.coupon_id From 38bdfe7177a015757bb4d61263e848e9a98d80fa Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 18:33:31 +0800 Subject: [PATCH 060/289] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1753__L_ALTER_COUPON.sql => V201906051820__L_ALTER_COUPON.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201906051753__L_ALTER_COUPON.sql => V201906051820__L_ALTER_COUPON.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051820__L_ALTER_COUPON.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906051820__L_ALTER_COUPON.sql From d8828f1034c1b37b33d33d2c323d39e26d9f6061 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 6 Jun 2019 10:47:27 +0800 Subject: [PATCH 061/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 13 +++++++++- .../migration/V201906061030__L_ALTER_FLOW.sql | 11 ++++++++ .../com/iformall/domain/vo/FlowModelVo.java | 22 ++++++++++++++++ .../com/iformall/domain/vo/UserTaskVo.java | 26 +++---------------- .../com/iformall/service/WxFlowService.java | 7 +++++ .../service/impl/WxFlowServiceImpl.java | 6 ++++- 6 files changed, 60 insertions(+), 25 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906061030__L_ALTER_FLOW.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index a98a2c8b3..80f4e3d77 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxFlowRecord; +import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; @@ -194,7 +195,17 @@ public class WxFlowAbleController extends BaseController { } - + /** + * 创建模板 + */ + @ApiOperation(value = "创建模板",notes = "{\"taskId\":\"\",\"processInstanceId\":\"\",\"remark\":\"\"}") + @PostMapping(value = "createModel") + @SystemControllerLog(description = "工作流-创建模板") + public ResultData createModel(@ModelAttribute FlowModelVo modelVo) { + MallUserInfo user = getUser(); + modelVo.setTenantId(getTenantId()); + return wxFlowService.createModel(modelVo); + } } \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906061030__L_ALTER_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201906061030__L_ALTER_FLOW.sql new file mode 100644 index 000000000..7e9d09547 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906061030__L_ALTER_FLOW.sql @@ -0,0 +1,11 @@ +drop table if exists `wx_flow_model`; +CREATE TABLE `wx_flow_model` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) NOT NULL COMMENT '租户id', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `flow` varchar(255) DEFAULT NULL COMMENT '流程', + `create_user` bigint(20) NOT NULL COMMENT '创建用户', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java new file mode 100644 index 000000000..59f6a2c68 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java @@ -0,0 +1,22 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class FlowModelVo implements Serializable{ + + private static final long serialVersionUID = 1L; + + @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") + private String name; + + @io.swagger.annotations.ApiModelProperty(value="节点列表",name="taskList") + private List taskList; + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java index 19005f321..fd143cf54 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java @@ -9,34 +9,14 @@ public class UserTaskVo implements Serializable{ private static final long serialVersionUID = 1L; + @io.swagger.annotations.ApiModelProperty(value="节点名称",name="name") private String name; + @io.swagger.annotations.ApiModelProperty(value="用户列表",name="userList") private List userList; //1普通 2会签 3或签 + @io.swagger.annotations.ApiModelProperty(value="节点类型,1普通 2会签 3或签",name="type") private Integer type; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getUserList() { - return userList; - } - - public void setUserList(List userList) { - this.userList = userList; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index f80c639c8..5eed0630a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCarCmdLog; import com.iformall.domain.po.WxFlowRecord; +import com.iformall.domain.vo.FlowModelVo; import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletResponse; import java.util.Map; @@ -88,4 +89,10 @@ public interface WxFlowService { * @return */ PageInfo myHandelList(WxFlowRecord record, Integer pageIndex, Integer pageSize); + + /** + * 创建模板 + * @return + */ + ResultData createModel(FlowModelVo modelVo); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 4bd15cce8..bd7671442 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -1132,5 +1133,8 @@ public class WxFlowServiceImpl implements WxFlowService { return null; } - + @Override + public ResultData createModel(FlowModelVo modelVo) { + return null; + } } From 6a8046c13b9fa0e94d4a438738530a8fe899ff56 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 6 Jun 2019 11:16:14 +0800 Subject: [PATCH 062/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 10 ++-- .../com/iformall/domain/po/WxFlowModel.java | 47 +++++++++++++++++++ .../com/iformall/domain/vo/FlowModelVo.java | 22 --------- .../iformall/mapper/WxFlowModelMapper.java | 15 ++++++ .../com/iformall/service/WxFlowService.java | 11 +++-- .../service/impl/WxFlowServiceImpl.java | 14 ++++-- .../resources/mapper/WxFlowModelMapper.xml | 38 +++++++++++++++ 7 files changed, 123 insertions(+), 34 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java delete mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 80f4e3d77..ae3f92957 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -5,8 +5,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; -import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; @@ -201,10 +201,10 @@ public class WxFlowAbleController extends BaseController { @ApiOperation(value = "创建模板",notes = "{\"taskId\":\"\",\"processInstanceId\":\"\",\"remark\":\"\"}") @PostMapping(value = "createModel") @SystemControllerLog(description = "工作流-创建模板") - public ResultData createModel(@ModelAttribute FlowModelVo modelVo) { - MallUserInfo user = getUser(); - modelVo.setTenantId(getTenantId()); - return wxFlowService.createModel(modelVo); + public ResultData createModel(@ModelAttribute WxFlowModel wxFlowModel) { + wxFlowModel.setTenantId(getTenantId()); + wxFlowModel.setCreateUser(getUserId()); + return wxFlowService.createModel(wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java new file mode 100644 index 000000000..76b34a7d8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -0,0 +1,47 @@ +package com.iformall.domain.po; + +import com.iformall.domain.vo.UserTaskVo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +/** + * @author luozukai + * @date 2019/6/6 10:50 + */ +@Table(name = "wx_flow_model") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxFlowModel extends BaseEntity { + @Id + protected Long 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="flow") + private String flow; + + @io.swagger.annotations.ApiModelProperty(value="创建用户",name="createUser") + private Long createUser; + + @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") + private Date createDate; + + @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") + private Date updateDate; + + @Transient + private List taskList; + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java deleted file mode 100644 index 59f6a2c68..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/vo/FlowModelVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.iformall.domain.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -@Data -public class FlowModelVo implements Serializable{ - - private static final long serialVersionUID = 1L; - - @io.swagger.annotations.ApiModelProperty(value="模板名称",name="name") - private String name; - - @io.swagger.annotations.ApiModelProperty(value="节点列表",name="taskList") - private List taskList; - - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java new file mode 100644 index 000000000..d49fb73a9 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java @@ -0,0 +1,15 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFlowModel; + +import java.util.List; + + +/** + * @author gongbiao + */ +public interface WxFlowModelMapper extends CommonMapper { + List findList(WxFlowModel wxFlowModel); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 5eed0630a..fd41d83a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -2,9 +2,8 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCarCmdLog; +import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; -import com.iformall.domain.vo.FlowModelVo; import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletResponse; import java.util.Map; @@ -94,5 +93,11 @@ public interface WxFlowService { * 创建模板 * @return */ - ResultData createModel(FlowModelVo modelVo); + ResultData createModel(WxFlowModel wxFlowModel); + + /** + * 模板列表 + * @return + */ + PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index bd7671442..76acba992 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.domain.vo.FlowModelVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -21,7 +20,6 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.bpmn.model.BpmnModel; -import org.flowable.bpmn.model.UserTask; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; @@ -92,6 +90,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxBillOtherMapper wxBillOtherMapper; @Autowired private WxBillOtherDepositMapper wxBillOtherDepositMapper; + @Autowired + private WxFlowModelMapper wxFlowModelMapper; /** * 获取流程key,1合同 2账单 @@ -1134,7 +1134,13 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData createModel(FlowModelVo modelVo) { - return null; + public ResultData createModel(WxFlowModel wxFlowModel) { + wxFlowModelMapper.insertSelective(wxFlowModel); + return new ResultData(); + } + + @Override + public PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowModelMapper.findList(wxFlowModel)); } } diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml new file mode 100644 index 000000000..75d1d1e7e --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + where 1 = 1 + + and `tenant_id` = #{tenantId} + + and `id` = #{id} + and `name` = #{name} + + order by ${sortColumns} + order by id desc + + + + + + + + + From ff5d3b46c298a966093f86016ae2cf5414268bff Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 5 Jun 2019 20:00:12 +0800 Subject: [PATCH 063/289] =?UTF-8?q?[banner=E5=9B=BE][=E6=96=B0=E5=A2=9E]:b?= =?UTF-8?q?anner=E5=9B=BE=E6=94=AF=E6=8C=81=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCampaignController.java | 11 +++++++++++ .../src/main/resources/mapper/WxCampaignMapper.xml | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index bcfc4245e..265e94309 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -82,6 +82,17 @@ public class WxCampaignController extends BaseController { return new ResultData(); } + @ApiOperation(value = "新增接口-小程序路径", notes = "produceType,produceId,pagePath,pageScene必填") + @PostMapping("addByPath") + @SystemControllerLog(description = "宣传页-新增") + public ResultData addByPath(@RequestBody WxCampaign wxCampaign) { + logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); + wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + wxCampaign.setTenantId(getTenantId()); + wxCampaignService.addForPath(wxCampaign); + return new ResultData(); + } + @ApiOperation("根据id更新接口") @PostMapping("update") @SystemControllerLog(description = "宣传页-id更新") diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index b398daf32..982dff917 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -22,20 +22,26 @@ + + + + + `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, - `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` + `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`, + `produce_type`,`produce_id`,`page_path`,`page_scene` - `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num` + `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`,`page_path` `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, - `mechant_id`,`sort_num`,`status`,`create_time`,`update_time` + `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`page_path` @@ -43,7 +49,6 @@ and `id` = #{id} - From bac2e4e515d203756e279f0ef79b9a8a0ce85f8d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 6 Jun 2019 12:09:47 +0800 Subject: [PATCH 064/289] =?UTF-8?q?[=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95[?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E4=BC=98=E5=8C=96=E9=9B=AA=E8=8A=B1?= =?UTF-8?q?=E7=AE=97=E6=B3=95=EF=BC=8C=E5=BC=95=E5=85=A5ip=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=8F=8A=E8=BF=9B=E7=A8=8BID=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/common/IdWorker.java | 51 ++++++++++++++++--- .../main/java/com/iformall/utils/IPUtil.java | 40 +++++++++++++++ 2 files changed, 83 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/IdWorker.java b/mallinkService/src/main/java/com/iformall/common/IdWorker.java index 24197c937..66279fd0c 100644 --- a/mallinkService/src/main/java/com/iformall/common/IdWorker.java +++ b/mallinkService/src/main/java/com/iformall/common/IdWorker.java @@ -1,5 +1,13 @@ package com.iformall.common; +import com.iformall.exception.MallinkException; +import com.iformall.utils.IPUtil; + +import java.lang.management.ManagementFactory; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; + public class IdWorker { // ==============================Fields=========================================== /** 开始时间截 (2015-01-01) */ @@ -55,7 +63,24 @@ public class IdWorker { } public IdWorker() { - this(0L, 0L); + String ipAddr = ""; + try { + ipAddr = IPUtil.getLocalHostLANAddress().getHostAddress(); + } catch (UnknownHostException e) { + e.printStackTrace(); + } + String[] ipArray = ipAddr.split("\\."); + Long ip = Long.valueOf(ipArray[2]) << 8 | Long.valueOf(ipArray[3]) & maxWorkerId; + Long processId = Long.valueOf(ManagementFactory.getRuntimeMXBean().getName().split("@")[0]) & maxDataCenterId; + + if (workerId > maxWorkerId || workerId < 0) { + throw new IllegalArgumentException(String.format("workerId can't be greater than %d or less than 0", maxWorkerId)); + } + if (dataCenterId > maxDataCenterId || dataCenterId < 0) { + throw new IllegalArgumentException(String.format("dataCenterId can't be greater than %d or less than 0", maxDataCenterId)); + } + this.workerId = workerId; + this.dataCenterId = dataCenterId; } //==============================Constructors===================================== @@ -139,14 +164,24 @@ public class IdWorker { public static void main(String[] args) { System.out.println(System.currentTimeMillis()); final IdWorker idWorker = IdWorker.get(); - long startTime = System.nanoTime(); - for (int i = 0; i < 50000; i++) { - long id = idWorker.nextId(); - System.out.println(id); - System.out.println(String.valueOf(id)); - System.out.println(String.valueOf(id).length()); + List list = new ArrayList<>(); + + for(int j=0;j< 10;j++) { + list.add(new Thread(() -> { + long startTime = System.nanoTime(); + for (int i = 0; i < 50000; i++) { + long id = idWorker.nextId(); + System.out.println(Thread.currentThread().getId() + ", " + id); + //System.out.println(String.valueOf(id)); + //System.out.println(String.valueOf(id).length()); + } + System.out.println((System.nanoTime() - startTime) / 1000000 + "ms"); + })); + } + for(int j=0;j<10;j++){ + Thread thread = list.get(j); + thread.start(); } - System.out.println((System.nanoTime()-startTime)/1000000+"ms"); } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/utils/IPUtil.java b/mallinkService/src/main/java/com/iformall/utils/IPUtil.java index 467d4dd32..bff1934f0 100644 --- a/mallinkService/src/main/java/com/iformall/utils/IPUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/IPUtil.java @@ -5,7 +5,9 @@ import org.slf4j.LoggerFactory; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; +import java.net.NetworkInterface; import java.net.UnknownHostException; +import java.util.Enumeration; public class IPUtil { private final static Logger logger = LoggerFactory.getLogger(IPUtil.class); @@ -49,4 +51,42 @@ public class IPUtil { return ipAddress; } + + // 正确的IP拿法,即优先拿site-local地址 + public static InetAddress getLocalHostLANAddress() throws UnknownHostException { + try { + InetAddress candidateAddress = null; + // 遍历所有的网络接口 + for (Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); ifaces.hasMoreElements();) { + NetworkInterface iface = (NetworkInterface) ifaces.nextElement(); + // 在所有的接口下再遍历IP + for (Enumeration inetAddrs = iface.getInetAddresses(); inetAddrs.hasMoreElements();) { + InetAddress inetAddr = (InetAddress) inetAddrs.nextElement(); + if (!inetAddr.isLoopbackAddress()) {// 排除loopback类型地址 + if (inetAddr.isSiteLocalAddress()) { + // 如果是site-local地址,就是它了 + return inetAddr; + } else if (candidateAddress == null) { + // site-local类型的地址未被发现,先记录候选地址 + candidateAddress = inetAddr; + } + } + } + } + if (candidateAddress != null) { + return candidateAddress; + } + // 如果没有发现 non-loopback地址.只能用最次选的方案 + InetAddress jdkSuppliedAddress = InetAddress.getLocalHost(); + if (jdkSuppliedAddress == null) { + throw new UnknownHostException("The JDK InetAddress.getLocalHost() method unexpectedly returned null."); + } + return jdkSuppliedAddress; + } catch (Exception e) { + UnknownHostException unknownHostException = new UnknownHostException( + "Failed to determine LAN address: " + e); + unknownHostException.initCause(e); + throw unknownHostException; + } + } } From 03a4f16fd188f9bc77e3b41fcf0c2aa591b54d6f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 10:40:20 +0800 Subject: [PATCH 065/289] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E5=82=AC=E7=BC=B4?= =?UTF-8?q?=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index b484db1e1..69db4816a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -612,8 +612,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxPayAccountBill.setTenantId(wxBillAll.getTenantId()); WxPayAccountBill payAccountBill = wxPayAccountBillMapper.selectOne(wxPayAccountBill); if (payAccountBill != null) { - result.put("accountNumber", payAccountBill.getBankCardId()); - result.put("accountName", payAccountBill.getBankAccountName()); + String bankCardId = payAccountBill.getBankCardId(); + String bankAccountName = payAccountBill.getBankAccountName(); + result.put("accountNumber", StringUtils.isNotEmpty(bankCardId) ? bankCardId : " "); + result.put("accountName", StringUtils.isNotEmpty(bankAccountName) ? bankCardId : " "); } else { result.put("accountNumber", " "); result.put("accountName", " "); @@ -710,8 +712,10 @@ public class WxBillAllServiceImpl implements WxBillAllService { result.put("merchant", wxMerchantVo.getMerchantName()); WxShopVo wxShopVo = wxMerchantVo.getShopVoList().parallelStream().filter(s -> StringUtils.isNotEmpty(s.getLinkPhone())).findAny().orElse(null); if (wxShopVo != null) { - result.put("linkPerson", wxShopVo.getLinkPerson()); - result.put("linkPhone", wxShopVo.getLinkPhone()); + String linkPerson = wxShopVo.getLinkPerson(); + String linkPhone = wxShopVo.getLinkPhone(); + result.put("linkPerson", StringUtils.isNotEmpty(linkPerson) ? linkPerson : " "); + result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPerson : " "); } else { result.put("linkPerson", " "); result.put("linkPhone", " "); @@ -975,4 +979,5 @@ public class WxBillAllServiceImpl implements WxBillAllService { String name = "待缴商户列表"; excelService.exportExcel(list, null, name, WaitMerchantVo.class, name + ".xlsx", response, false); } + } From 4c2c165352b2693ba5067947b01fe807ed6a8bd9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 10:51:08 +0800 Subject: [PATCH 066/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=9F=BA=E6=9C=AC=E4=B8=9A=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxActivityController.java | 80 ++++++++++ .../com/iformall/enums/EnumActivityType.java | 36 +++++ .../iformall/service/WxActivityService.java | 48 ++++++ .../service/impl/WxActivityServiceImpl.java | 144 ++++++++++++++++++ 4 files changed, 308 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumActivityType.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxActivityService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java new file mode 100644 index 000000000..dc54b32c3 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -0,0 +1,80 @@ +package com.iformall.controller.market; + +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxActivity; +import com.iformall.enums.EnumActivityStatus; +import com.iformall.service.WxActivityService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("wxActivity") +@Api(description = "活动") +public class WxActivityController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxActivityService wxActivityService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "活动-列表") + public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxActivityController::list"); + if (null == wxActivity) wxActivity = new WxActivity(); + if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) { + wxActivity.setStatus(null); + } + wxActivity.setTenantId(getTenantId()); + wxActivity.setSortColumns(WxActivity.Field.Id_DESC); + final PageInfo page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + @SystemControllerLog(description = "活动-新增") + public ResultData add(@RequestBody WxActivity wxActivity) { + logger.debug("[" + getIpAddr() + "] WxActivityController::add"); + wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + wxActivity.setTenantId(getTenantId()); + wxActivityService.saveOrUpdate(wxActivity); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + @SystemControllerLog(description = "活动-id更新") + public ResultData update(@RequestBody WxActivity wxActivity) { + logger.debug("[" + getIpAddr() + "] WxActivityController::update"); + return wxActivityService.saveOrUpdate(wxActivity); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "活动-查询") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxActivityController::findById"); + WxActivity wxActivity = wxActivityService.getById(id); + return new ResultData(Result.SUCCESS, "查询成功", wxActivity); + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityType.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityType.java new file mode 100644 index 000000000..a2e78ce58 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityType.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumActivityType { + + STABLE(1, "固定格式"), + FREE(2, "自由图文"), + PAGEPATH(3, "小程序路径"),; + + public static EnumActivityType getEnum(Integer code) { + for (EnumActivityType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumActivityType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java new file mode 100644 index 000000000..67a5c0a9d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -0,0 +1,48 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxActivity; + +import javax.servlet.http.HttpServletResponse; + +public interface WxActivityService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxActivity getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(WxActivity record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + ResultData updateStatus(WxActivity wxActivity); + + void printHtmlById(Long id, HttpServletResponse response); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java new file mode 100644 index 000000000..a78ab814e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -0,0 +1,144 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxActivity; +import com.iformall.enums.EnumActivityStatus; +import com.iformall.enums.EnumActivityType; +import com.iformall.mapper.WxActivityMapper; +import com.iformall.mapper.WxCouponChannelMapper; +import com.iformall.service.WxActivityService; +import com.iformall.service.WxCouponChannelService; +import com.iformall.service.WxCouponService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + +/** + * @author gongbiao + */ +@Service +public class WxActivityServiceImpl implements WxActivityService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxActivityMapper wxActivityMapper; + + @Autowired + WxCouponChannelMapper wxCouponChannelMapper; + + @Autowired + WxCouponService wxCouponService; + + @Autowired + WxCouponChannelService wxCouponChannelService; + + @Override + public PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityMapper.findList(record)); + } + + @Override + public WxActivity getById(Long id) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + String html = wxActivity.getHtml(); + if (!StringUtils.isEmpty(html)) { + try { + html = URLDecoder.decode(html, "utf-8"); + } catch (UnsupportedEncodingException e) { + logger.info("图文内容解码失败"); + } + wxActivity.setHtml(html); + } + return wxActivity; + } + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) + @Override + public ResultData saveOrUpdate(WxActivity wxActivity) { + if (wxActivity.getType().equals(EnumActivityType.STABLE.getCode())) { + if (StringUtils.isEmpty(wxActivity.getCoverImg())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "封面图不能为空"); + } + if (StringUtils.isEmpty(wxActivity.getTitle())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "标题不能为空"); + } + if (StringUtils.isEmpty(wxActivity.getDetail())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "活动说明不能为空"); + } + } else if (wxActivity.getType().equals(EnumActivityType.FREE.getCode())) { + if (StringUtils.isEmpty(wxActivity.getHtml())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "图文不能为空"); + } + int length = wxActivity.getHtml().getBytes().length; + if (length >= 0xFFFFFF) { //Mysql MiddleText length limited + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "图文内容过大无法保存"); + } + } else { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); + if (wxActivity.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + wxActivity.setId(idWorker.nextId()); + wxActivityMapper.insertSelective(wxActivity); + } else { + wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + } + return new ResultData(Result.SUCCESS, "操作成功"); + } + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) + @Override + public ResultData updateStatus(WxActivity wxActivity) { + wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + return new ResultData(Result.SUCCESS, "操作成功"); + } + + @Override + public void deleteById(Long id) { + wxActivityMapper.deleteByPrimaryKey(id); + } + + + @Override + public void printHtmlById(Long id, HttpServletResponse response) { + try { + response.setHeader("Content-type", "text/html;charset=utf-8"); + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + String html = StringUtils.isEmpty(wxActivity.getHtml()) ? "" : wxActivity.getHtml(); + try { + html = URLDecoder.decode(html, "utf-8"); + } catch (UnsupportedEncodingException e) { + logger.info("图文内容解码失败"); + } + // 循环取出流中的数据 + byte[] b = new byte[1024]; + int len; + InputStream inStream = new ByteArrayInputStream(html.getBytes()); + while ((len = inStream.read(b)) > 0) { + response.getOutputStream().write(b, 0, len); + } + inStream.close(); + } catch (Exception e) { + logger.info("输出富文本内容" + e.getMessage()); + e.printStackTrace(); + } + } + + +} From 6b7b207c186c0e57895c7d63ae822575b2e753c3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 13:42:14 +0800 Subject: [PATCH 067/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=9F=BA=E6=9C=AC=E4=B8=9A=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxActivityController.java | 8 ++++++++ .../db/migration/V201906041430__ALTER_CAMPAIGN.sql | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index dc54b32c3..b4bd19764 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -66,6 +66,14 @@ public class WxActivityController extends BaseController { return wxActivityService.saveOrUpdate(wxActivity); } + @ApiOperation("根据id更新接口") + @PostMapping("updateStatus") + @SystemControllerLog(description = "活动-更新状态") + public ResultData updateStatus(@RequestBody WxActivity wxActivity) { + logger.debug("[" + getIpAddr() + "] WxActivityController::updateStatus"); + return wxActivityService.updateStatus(wxActivity); + } + @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql deleted file mode 100644 index 1569c109c..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201906041430__ALTER_CAMPAIGN.sql +++ /dev/null @@ -1,8 +0,0 @@ -alter table wx_campaign -add column `person_limit` int(11) DEFAULT 0 COMMENT '报名人数', -add column `activity_time` datetime COMMENT '活动时间', -add column `use_credit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否', -add column `credit` int(11) DEFAULT 0 COMMENT '消耗积分', -add column `question` json NOT NULL COMMENT '问题', -add column `is_expired` smallint(2) DEFAULT 1 COMMENT '是否过期1是0否', -add column `activity_type` smallint(2) DEFAULT 1 COMMENT '活动类型1直接投放2限时投放'; From cf7ed9f5d55536b2ef99e512adaa4a7661c436de Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 6 Jun 2019 14:01:06 +0800 Subject: [PATCH 068/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E8=B6=85=E8=BF=87?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=99=90=E5=88=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxActivityJoinController.java | 4 +++- .../src/main/java/com/iformall/common/ErrorCode.java | 6 ++++++ .../service/impl/WxActivityJoinServiceImpl.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java index 58bde729f..55e51f15e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java @@ -58,7 +58,9 @@ public class WxActivityJoinController extends BaseController { if (wxActivityJoin.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } - + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); + } if (wxActivityJoin.getStatus() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空"); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b57641faf..5f8a50ed0 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -428,6 +428,12 @@ public enum ErrorCode{ EXCEL_IMPORT_ERROR(29002, "Excel数据导入出错"), TOPIC_EXIST_NAME(29100, "已存在投放的专题"), + + + /** + * 活动 + */ + ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index b10002f67..69df3f102 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; @@ -53,6 +54,17 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData modifyStatus(WxActivityJoin wxActivityJoin) { + if (wxActivityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + Integer personLimit = wxActivity.getPersonLimit(); + WxActivityJoin params = new WxActivityJoin(); + params.setTenantId(wxActivity.getTenantId()); + params.setActivityId(wxActivity.getId()); + int count = wxActivityJoinMapper.selectCount(params); + if (personLimit.equals(count)) { + return new ResultData(ErrorCode.ACTIVITY_PERSON_LIMITED, count); + } + } wxActivityJoinMapper.updateByPrimaryKeySelective(wxActivityJoin); return new ResultData(Result.SUCCESS, "操作成功"); } From 49d6eddc9b5b24e7ae97fa8cc48ef3d83865f5ba Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 6 Jun 2019 14:09:24 +0800 Subject: [PATCH 069/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 15 ++++++++ .../com/iformall/domain/vo/FlowUserVo.java | 18 +++++++++ .../com/iformall/domain/vo/UserTaskVo.java | 2 +- .../java/com/iformall/enums/EnumTaskType.java | 38 +++++++++++++++++++ .../service/impl/WxFlowServiceImpl.java | 24 ++++++++++++ 5 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index ae3f92957..13ff88f3d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -207,5 +207,20 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.createModel(wxFlowModel); } + /** + * 模板列表 + */ + @ApiOperation("模板列表") + @GetMapping(value = "/modelList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + @SystemControllerLog(description = "工作流-模板列表") + public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); + wxFlowModel.setTenantId(getTenantId()); + return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); + } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java new file mode 100644 index 000000000..849c9d845 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java @@ -0,0 +1,18 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; + +@Data +public class FlowUserVo implements Serializable{ + + private static final long serialVersionUID = 1L; + + @io.swagger.annotations.ApiModelProperty(value="用户id",name="id") + private Long id; + + @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") + private String name; + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java index fd143cf54..7d444d1e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java @@ -13,7 +13,7 @@ public class UserTaskVo implements Serializable{ private String name; @io.swagger.annotations.ApiModelProperty(value="用户列表",name="userList") - private List userList; + private List userList; //1普通 2会签 3或签 @io.swagger.annotations.ApiModelProperty(value="节点类型,1普通 2会签 3或签",name="type") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java new file mode 100644 index 000000000..4287eeb06 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumTaskType { + + + NORMAL(1, "正常"), + AND(2, "会签"), + OR(3,"或签"), + ; + + public static EnumTaskType getEnum(Integer code) { + for (EnumTaskType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumTaskType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 76acba992..a3394e204 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -4,11 +4,14 @@ import com.alibaba.druid.support.json.JSONUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.domain.vo.FlowUserVo; +import com.iformall.domain.vo.UserTaskVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -1135,6 +1138,27 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData createModel(WxFlowModel wxFlowModel) { + final IdWorker idWorker = IdWorker.get(); + wxFlowModel.setId(idWorker.nextId()); + + String flow = "发起人-"; + for (UserTaskVo taskVo:wxFlowModel.getTaskList()) { + List userInfoList = taskVo.getUserList(); + for (int i = 0; i < userInfoList.size()-1; i++) { + if(i == userInfoList.size()-1){ + flow += userInfoList.get(i).getName(); + }else{ + flow += userInfoList.get(i).getName() + "、"; + } + } + if(taskVo.getType().equals(EnumTaskType.AND.getCode())){ + flow += "(会签)"; + }else if(taskVo.getType().equals(EnumTaskType.OR.getCode())){ + flow += "(或签)"; + } + flow += "-"; + } + flow += "结束"; wxFlowModelMapper.insertSelective(wxFlowModel); return new ResultData(); } From ff636fd8d75c75487cfe36e4c7652168eed0b7c5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 6 Jun 2019 17:24:18 +0800 Subject: [PATCH 070/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxFlowModel.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 69 +++++++++++++------ 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 76b34a7d8..9a32bcf89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -42,6 +42,6 @@ public class WxFlowModel extends BaseEntity { private Date updateDate; @Transient - private List taskList; + private List lists; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index a3394e204..681188873 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -18,11 +18,13 @@ import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.utils.Constant; +import com.iformall.utils.JsonUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; -import org.flowable.bpmn.model.BpmnModel; +import org.flowable.bpmn.model.*; +import org.flowable.bpmn.model.Process; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; @@ -1138,27 +1140,52 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData createModel(WxFlowModel wxFlowModel) { + Process process = new Process(); + BpmnModel bpmnModel = new BpmnModel(); + + StartEvent start = new StartEvent(); + start.setId("start"); + start.setName("开始节点"); + +// SequenceFlow sequenceFlow = new SequenceFlow(); +// sequenceFlow.setId("sf1"); +// sequenceFlow.setName("开始节点"); +// sequenceFlow.setSourceRef("start"); +// sequenceFlow.setTargetRef("userTask1"); +// +// start.setOutgoingFlows(Arrays.asList(sequenceFlow)); + + process.addFlowElement(start); +// process.addFlowElement(sequenceFlow); + + String sourceRef = "start"; + String targetRef = ""; + SequenceFlow sourceFlow; + SequenceFlow targetFlow ; + + //todo 得用递归 +// for (int i = 0; i < wxFlowModel.getLists().size()-1; i++) { +// //UserTaskVo taskVo = wxFlowModel.getLists().get(i); +// +// SequenceFlow sf = new SequenceFlow(); +// sf.setId("sf"+i); +// sf.setName("节点"+i); +// sf.setSourceRef(sourceRef); +// +// UserTask userTask = new UserTask(); +// userTask.setName((i+1)+"级审批"); +// userTask.setId("userTask"+(i+1)); +// userTask.setIncomingFlows(Arrays.asList(sf)); +// userTask.setOutgoingFlows(Arrays.asList(sf)); +// +// sf.setTargetRef(userTask.getId()); +// +// sourceRef = userTask.getId(); +// } + + wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); final IdWorker idWorker = IdWorker.get(); wxFlowModel.setId(idWorker.nextId()); - - String flow = "发起人-"; - for (UserTaskVo taskVo:wxFlowModel.getTaskList()) { - List userInfoList = taskVo.getUserList(); - for (int i = 0; i < userInfoList.size()-1; i++) { - if(i == userInfoList.size()-1){ - flow += userInfoList.get(i).getName(); - }else{ - flow += userInfoList.get(i).getName() + "、"; - } - } - if(taskVo.getType().equals(EnumTaskType.AND.getCode())){ - flow += "(会签)"; - }else if(taskVo.getType().equals(EnumTaskType.OR.getCode())){ - flow += "(或签)"; - } - flow += "-"; - } - flow += "结束"; wxFlowModelMapper.insertSelective(wxFlowModel); return new ResultData(); } @@ -1167,4 +1194,6 @@ public class WxFlowServiceImpl implements WxFlowService { public PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowModelMapper.findList(wxFlowModel)); } + + } From f8f5201020e3740cb0f57918221b255fb0a040aa Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 7 Jun 2019 21:47:35 +0800 Subject: [PATCH 071/289] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E5=90=8C=E4=B8=80=E8=BE=86=E8=BD=A6=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E5=A4=A9=E5=86=85=E5=A4=9A=E6=AC=A1=E8=BF=9B=E5=9C=BA=EF=BC=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxCarCmdLogMapper.java | 2 +- .../iformall/service/impl/WxCarCmdLogServiceImpl.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index 4ebc69474..78be4fadc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -24,7 +24,7 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryPlateNumberList(Map carParams); - String queryTenantIdBySynId(HashMap params); + List queryTenantIdBySynId(HashMap params); Long queryWeekCarPayCount(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index c4e91a655..a71600f81 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; import java.util.HashMap; -import java.util.Map; +import java.util.List; @Service public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @@ -52,7 +52,12 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { @Override public String getTenantIdBySynId(HashMap params) { - return wxCarCmdLogMapper.queryTenantIdBySynId(params); + // 同一辆车,一天内可能多次入场 + List list = wxCarCmdLogMapper.queryTenantIdBySynId(params); + if(list.size() > 0) { + return list.get(0); + } + return null; } From 38907835b413cca4908ea4deae24bfa9c714293d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 09:50:35 +0800 Subject: [PATCH 072/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=8A=95=E6=94=BE=E5=88=B0=E5=AE=A3=E4=BC=A0=E9=A1=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxActivityController.java | 8 ++++ .../iformall/service/WxActivityService.java | 9 +---- .../service/impl/WxActivityServiceImpl.java | 39 +++++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java index b4bd19764..25ca595ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java @@ -84,5 +84,13 @@ public class WxActivityController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxActivity); } + @ApiOperation("投放到宣传页") + @GetMapping("/sendToCampaign") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "活动-投放到宣传页") + public ResultData sendToCampaign(Long id) { + logger.debug("[" + getIpAddr() + "] WxActivityController::sendToCampaign"); + return wxActivityService.sendToCampaign(id); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java index 67a5c0a9d..d1fab041e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -33,16 +33,11 @@ public interface WxActivityService { */ ResultData saveOrUpdate(WxActivity record); - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - ResultData updateStatus(WxActivity wxActivity); void printHtmlById(Long id, HttpServletResponse response); + ResultData sendToCampaign(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index a78ab814e..6d9514c8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -7,13 +7,12 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxCampaign; import com.iformall.enums.EnumActivityStatus; import com.iformall.enums.EnumActivityType; import com.iformall.mapper.WxActivityMapper; -import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxActivityService; -import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; +import com.iformall.service.WxCampaignService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,15 +36,8 @@ public class WxActivityServiceImpl implements WxActivityService { @Autowired WxActivityMapper wxActivityMapper; - - @Autowired - WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - WxCouponService wxCouponService; - - @Autowired - WxCouponChannelService wxCouponChannelService; + WxCampaignService wxCampaignService; @Override public PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { @@ -109,12 +101,6 @@ public class WxActivityServiceImpl implements WxActivityService { return new ResultData(Result.SUCCESS, "操作成功"); } - @Override - public void deleteById(Long id) { - wxActivityMapper.deleteByPrimaryKey(id); - } - - @Override public void printHtmlById(Long id, HttpServletResponse response) { try { @@ -140,5 +126,24 @@ public class WxActivityServiceImpl implements WxActivityService { } } + @Override + public ResultData sendToCampaign(Long id) { + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxCampaign campaign = new WxCampaign(); + campaign.setTenantId(wxActivity.getTenantId()); + campaign.setTitle(wxActivity.getTitle()); + campaign.setSubTitle(wxActivity.getSubTitle()); + campaign.setDetail(wxActivity.getDetail()); + campaign.setValidStartDate(wxActivity.getStartTime()); + campaign.setValidEndDate(wxActivity.getEndTime()); + campaign.setType(wxActivity.getType()); + campaign.setHtml(wxActivity.getHtml()); + campaign.setProduceType(2); + campaign.setProduceId(wxActivity.getId()); + campaign.setPagePath(wxActivity.getWeappPath()); + campaign.setPageScene(wxActivity.getWeappScene()); + return wxCampaignService.addForPath(campaign); + } + } From 3dfc1220be0916363ec0a082623031ef1ff1f4fc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 10:31:39 +0800 Subject: [PATCH 073/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=9B=E5=BB=BA=E8=A1=A8SQL]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906101025__ADD_ACTIVITY_JOIN.sql | 21 +++++++++++++++++++ .../V201906101026__ALTER_ACTIVITY_JOIN.sql | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906101025__ADD_ACTIVITY_JOIN.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906101026__ALTER_ACTIVITY_JOIN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906101025__ADD_ACTIVITY_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906101025__ADD_ACTIVITY_JOIN.sql new file mode 100644 index 000000000..0ffe531fb --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906101025__ADD_ACTIVITY_JOIN.sql @@ -0,0 +1,21 @@ +drop table if exists `wx_activity_join`; +CREATE TABLE IF NOT EXISTS `wx_activity_join` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `user_id` bigint(20) NOT NULL COMMENT 'C端用户ID', + `activity_id` bigint(20) NOT NULL COMMENT '活动ID', + `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '姓名', + `nick_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '昵称', + `birthday` datetime COMMENT '生日', + `phone` varchar(15) NOT NULL COMMENT '手机号', + `sex` smallint(2) DEFAULT 0 COMMENT '性别0保密1男2女', + `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '地址', + `answer` json NOT NULL COMMENT '答案', + `sign_in` smallint(2) DEFAULT 0 COMMENT '签到状态1签到0未签到', + `status` smallint(2) DEFAULT 0 COMMENT '状态0未确认-报名中1确认-报名成功2取消-报名失败3过期', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + INDEX `id_index` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动报名表' CHECKSUM=0 DELAY_KEY_WRITE=0; + diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906101026__ALTER_ACTIVITY_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906101026__ALTER_ACTIVITY_JOIN.sql new file mode 100644 index 000000000..89738ae98 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906101026__ALTER_ACTIVITY_JOIN.sql @@ -0,0 +1,5 @@ +alter table wx_activity_join add column img_url json COMMENT '图片'; +update wx_activity_join set img_url=json_array(); + +###删除wx_campaign_join +drop table if exists `wx_campaign_join`; \ No newline at end of file From cc356dcf7a71f5c00f93cbc04900b1bea08f6394 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 10:41:03 +0800 Subject: [PATCH 074/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=8A=95=E6=94=BE=E5=88=B0=E5=AE=A3=E4=BC=A0=E9=A1=B5?= =?UTF-8?q?=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/enums/EnumActivityStatus.java | 3 ++- .../com/iformall/service/impl/WxActivityServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java index 86f3ed7ed..08f18e6d0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityStatus.java @@ -8,7 +8,8 @@ public enum EnumActivityStatus { // 0-已上架;1-已下架; STATUS_THROW_IN(0, "已上架"), - STATUS_TAKE_OFFF(1, "已下架"),; + STATUS_TAKE_OFFF(1, "已下架"), + INJECT_CAMPAIGN(2, "投放到宣传页"),; public static EnumActivityStatus getEnum(Integer code) { for (EnumActivityStatus value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 6d9514c8f..be4410bf9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -26,6 +26,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.Date; /** * @author gongbiao @@ -128,7 +129,12 @@ public class WxActivityServiceImpl implements WxActivityService { @Override public ResultData sendToCampaign(Long id) { + //修改投放状态 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); + wxActivity.setUpdateTime(new Date()); + wxActivityMapper.updateByPrimaryKeySelective(wxActivity); + //添加到宣传页 WxCampaign campaign = new WxCampaign(); campaign.setTenantId(wxActivity.getTenantId()); campaign.setTitle(wxActivity.getTitle()); From af9c13fd3048a760aab3cff744f7fc9f3d7049ac Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 11:53:09 +0800 Subject: [PATCH 075/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=8A=A5=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxActivityJoinController.java | 58 +++++++++++++++++++ .../com/iformall/domain/po/WxActivity.java | 5 +- .../enums/EnumActivityUseCreditStatus.java | 36 ++++++++++++ .../iformall/mapper/WxActivityJoinMapper.java | 5 ++ .../service/WxActivityJoinService.java | 5 ++ .../impl/WxActivityJoinServiceImpl.java | 55 ++++++++++++++++++ .../resources/mapper/WxActivityJoinMapper.xml | 12 +++- 7 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumActivityUseCreditStatus.java diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java new file mode 100644 index 000000000..be783368c --- /dev/null +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -0,0 +1,58 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxActivityJoin; +import com.iformall.service.WxActivityJoinService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("/api/wxActivityJoin") +@Api(description = "活动报名") +public class WxActivityJoinController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxActivityJoinService wxActivityJoinService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { + if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); + wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.setSortColumns(WxActivityJoin.Field.CreateTime_DESC); + final PageInfo page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("报名") + @PostMapping("join") + public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { + if (wxActivityJoin.getUserId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "userId不能为空"); + } + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); + } + wxActivityJoin.setTenantId(getTenantId()); + wxActivityJoin.setUserId(getUserId()); + return wxActivityJoinService.join(wxActivityJoin); + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 767763718..6ab0394fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -73,11 +73,11 @@ public class WxActivity extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") - protected Date starttime; + private Date starttime; @Transient @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") - protected Date endtime; + private Date endtime; @Transient @@ -88,6 +88,7 @@ public class WxActivity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "小程序二维码Scene", name = "weappScene") protected String weappScene; + public String getWeappPath() { if (type == null) return "pages/index/index"; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityUseCreditStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityUseCreditStatus.java new file mode 100644 index 000000000..b8d647775 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityUseCreditStatus.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumActivityUseCreditStatus { + + + YES(1, "使用"), + NO(0, "不使用"),; + + public static EnumActivityUseCreditStatus getEnum(Integer code) { + for (EnumActivityUseCreditStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumActivityUseCreditStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index 1d6583c2f..6fa357902 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -5,8 +5,13 @@ import com.iformall.domain.po.WxActivityJoin; import java.util.List; +/** + * @author gongbiao + */ public interface WxActivityJoinMapper extends CommonMapper { List findList(WxActivityJoin params); + void cfindList(WxActivityJoin wxActivityJoin); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java index 0e13e825d..94dbf2cb5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; import javax.servlet.http.HttpServletRequest; @@ -22,4 +23,8 @@ public interface WxActivityJoinService { ResultData sendMsg(WxActivityJoin wxActivityJoin); + PageInfo clistAsPage(WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize); + + ResultData join(WxActivityJoin wxActivityJoin); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 69df3f102..091143864 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -7,11 +7,15 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; +import com.iformall.domain.po.WxCUser; +import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.*; import com.iformall.mapper.WxActivityJoinMapper; import com.iformall.mapper.WxActivityMapper; +import com.iformall.mapper.WxCUserBasicInfoMapper; +import com.iformall.mapper.WxCUserMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.ExcelService; import com.iformall.service.WxActivityJoinService; @@ -21,6 +25,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,6 +53,12 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Autowired private MqBaseProducer mqBaseProducer; + @Autowired + WxCUserMapper wxCUserMapper; + + @Autowired + WxCUserBasicInfoMapper wxCUserBasicInfoMapper; + @Override public PageInfo listAsPage(WxActivityJoin record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityJoinMapper.findList(record)); @@ -104,6 +116,49 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { return new ResultData(); } + @Override + public PageInfo clistAsPage(WxActivityJoin wxActivityJoin, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityJoinMapper.cfindList(wxActivityJoin)); + } + + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) + @Override + public ResultData join(WxActivityJoin wxActivityJoin) { + WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); + WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); + basicInfo.setPhone(user.getPhone()); + basicInfo.setTenantId(user.getTenantId()); + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(basicInfo); + //保存到会员表中 + wxCUserBasicInfo.setName(wxActivityJoin.getName()); + wxCUserBasicInfo.setNickName(wxActivityJoin.getNickName()); + wxCUserBasicInfo.setSex(wxActivityJoin.getSex()); + wxCUserBasicInfo.setAddress(wxActivityJoin.getAddress()); + wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfo); + //保存到报名表中 + wxActivityJoinMapper.insertSelective(wxActivityJoin); + //查询是否消耗积分 + WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { + Integer userCredit = user.getCredit(); + Integer credit = wxActivity.getCredit(); + Map data = new HashMap<>(); + if (credit > userCredit) { + data.put("useCredit", credit); + data.put("totalCredit", userCredit); + return new ResultData(ErrorCode.CREDIT_NOT_ENOUGH, data); + } + userCredit = userCredit - credit; + user.setCredit(userCredit); + wxCUserMapper.updateByPrimaryKeySelective(user); + data.put("useCredit", credit); + data.put("totalCredit", userCredit); + return new ResultData(data); + } + return new ResultData(); + } + private void sendMessage(WxActivityJoin join, WxActivity activity) { logger.info("》》》》》》》》》》》"); logger.info("活动发送短信开始"); diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 29de895c2..751fab00a 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -66,6 +66,16 @@ from wx_activity_join - + + From 594a721ca07bbdd90b164bd39a2ad11a28b5c26a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 10 Jun 2019 12:35:52 +0800 Subject: [PATCH 076/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906101156__ALTER_ACTIVITY.sql | 4 ++++ .../src/main/java/com/iformall/domain/po/WxActivity.java | 7 +++++++ .../src/main/resources/mapper/WxActivityJoinMapper.xml | 2 +- .../src/main/resources/mapper/WxActivityMapper.xml | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906101156__ALTER_ACTIVITY.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906101156__ALTER_ACTIVITY.sql b/mallinkAdmin/src/main/resources/db/migration/V201906101156__ALTER_ACTIVITY.sql new file mode 100644 index 000000000..349a134b5 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906101156__ALTER_ACTIVITY.sql @@ -0,0 +1,4 @@ +alter table wx_activity +add column use_img smallint(2) DEFAULT 0 COMMENT '是否上传图片1是0否', +add column img_detail varchar(255) DEFAULT '' COMMENT '图片说明' +; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 6ab0394fa..046ea1307 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -71,6 +71,13 @@ public class WxActivity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "活动结束时间", name = "activityEndTime") private Date activityEndTime; + + @io.swagger.annotations.ApiModelProperty(value = "是否上传图片1是0否", name = "useImg") + private Integer useImg; + + @io.swagger.annotations.ApiModelProperty(value = "图片说明", name = "imgDetail") + private String imgDetail; + @Transient @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 751fab00a..db9ab4a15 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -68,7 +68,7 @@ + select + from mall_user_action + + + + + + + + + + + + + + + mua.`id`,mua.`user_id`,mua.`type`,mua.`ip`,mua.`action_desc`,mua.`action_time`,mui.`name` + + + + where 1 = 1 + + and mua.`id` = #{id} + + + and mua.`user_id` = #{userId} + + + and mui.`name` like concat('%', #{name},'%') + + + and mua.`type` = #{type} + + + and mua.`ip` like concat('%', #{ip},'%') + + + and mua.`action_desc` like concat('%', #{actionDesc},'%') + + + and mua.`action_time` = #{actionTime} + + + and mua.id in + + #{idItem} + + + order by ${sortColumns} + - + select + from mall_user_action mua + left join mall_user_info mui on mua.user_id = mui.id + From 6e4cd19654f438e4d4a180995b4df202b21c1212 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 14:35:26 +0800 Subject: [PATCH 101/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 11 +++++ .../com/iformall/domain/po/WxFlowConfig.java | 1 + .../iformall/mapper/WxFlowConfigMapper.java | 13 ++++++ .../com/iformall/service/WxFlowService.java | 6 +++ .../service/impl/WxFlowServiceImpl.java | 15 +++++-- .../resources/mapper/WxFlowConfigMapper.xml | 41 +++++++++++++++++++ 6 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index f5b73740c..a52421d14 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -218,6 +218,17 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.findModelById(wxFlowModel); } + /** + * 删除模板 + */ + @ApiOperation(value = "删除模板") + @PostMapping(value = "delModel") + @SystemControllerLog(description = "工作流-删除模板") + public ResultData delModel(@ModelAttribute WxFlowModel wxFlowModel) { + wxFlowModel.setTenantId(getTenantId()); + return wxFlowService.createModel(wxFlowModel); + } + /** * 模板列表 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index a67b23957..c03d8995a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -42,6 +42,7 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") private Date updateDate; + @Transient private WxFlowModel wxFlowModel; @Transient diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java new file mode 100644 index 000000000..c45553609 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFlowConfig; +import java.util.List; + +/** + * @author luozukai + */ +public interface WxFlowConfigMapper extends CommonMapper { + List findList(WxFlowConfig wxFlowConfig); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 727181b8a..1f67633ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -101,6 +101,12 @@ public interface WxFlowService { */ ResultData findModelById(WxFlowModel wxFlowModel); + /** + * 删除模板 + * @return + */ + ResultData delModel(WxFlowModel wxFlowModel); + /** * 模板列表 * @return diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0782a1790..26736dc58 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1158,12 +1158,15 @@ public class WxFlowServiceImpl implements WxFlowService { process.addFlowElement(start); process.addFlowElement(sequenceFlow); - - wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); final IdWorker idWorker = IdWorker.get(); wxFlowModel.setId(idWorker.nextId()); - wxFlowModelMapper.insertSelective(wxFlowModel); + if(wxFlowModel.getId() == null) { + wxFlowModelMapper.insertSelective(wxFlowModel); + }else{ + wxFlowModel.setUpdateDate(new Date()); + wxFlowModelMapper.updateByPrimaryKeySelective(wxFlowModel); + } return new ResultData(); } @@ -1221,4 +1224,10 @@ public class WxFlowServiceImpl implements WxFlowService { public ResultData findModelById(WxFlowModel wxFlowModel) { return new ResultData(wxFlowModelMapper.selectByPrimaryKey(wxFlowModel.getId())); } + + @Override + public ResultData delModel(WxFlowModel wxFlowModel) { + wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); + return new ResultData(); + } } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml new file mode 100644 index 000000000..b836d6191 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + where 1 = 1 + + and `tenant_id` = #{tenantId} + + and `id` = #{id} + and `name` like concat('%', #{name},'%') + + order by ${sortColumns} + order by id desc + + + + + + + + + From 4b55ffcdf8120a3cd19c98435b86a2ffc93afa42 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 15:22:29 +0800 Subject: [PATCH 102/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=BF=94=E5=9B=9E=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxActivityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 7a49d4bd5..116c9082c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -186,7 +186,7 @@ public class WxActivityServiceImpl implements WxActivityService { return EnumActivityEnrollStatus.END.getCode(); } } - return EnumActivityEnrollStatus.END.getCode(); + return EnumActivityEnrollStatus.NORMAL.getCode(); } From 308b4c90236db5318abac2d78b49d3851ef503be Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 15:48:06 +0800 Subject: [PATCH 103/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=B8=8D=E6=9B=B4=E6=96=B0=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxActivityJoinServiceImpl.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 3ac1c22d3..76cf14661 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -8,7 +8,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.*; @@ -125,22 +124,12 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); - WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); - basicInfo.setPhone(user.getPhone()); - basicInfo.setTenantId(user.getTenantId()); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(basicInfo); - //保存到会员表中 - wxCUserBasicInfo.setName(wxActivityJoin.getName()); - wxCUserBasicInfo.setNickName(wxActivityJoin.getNickName()); - wxCUserBasicInfo.setSex(wxActivityJoin.getSex()); - wxCUserBasicInfo.setAddress(wxActivityJoin.getAddress()); - wxCUserBasicInfoMapper.updateByPrimaryKeySelective(wxCUserBasicInfo); //保存到报名表中 wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { + WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); Integer userCredit = user.getCredit(); Integer credit = wxActivity.getCredit(); Map data = new HashMap<>(); From 2a138af9329196120409ed3a796108128df2a0c3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 11 Jun 2019 16:01:00 +0800 Subject: [PATCH 104/289] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E6=A0=B8=E9=94=80=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c5972e1fb..e436598b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -349,7 +349,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(wxCoupon.getId()); creditHistory.setBusinessId(Long.valueOf(wxCoupon.getBusiness())); - creditHistory.setSpend(couponOrder.getSalePrice()); + creditHistory.setSpend(couponOrder.getCouponPrice()); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(bUser.getMerchantId()); wxCreditHistoryService.saveOrUpdate(creditHistory); From bbc07db73b66d04eed219c4fef1b1ece83a1fc25 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 16:19:39 +0800 Subject: [PATCH 105/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 76cf14661..4d6951b85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; @@ -125,6 +126,8 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData join(WxActivityJoin wxActivityJoin) { //保存到报名表中 + final IdWorker idWorker = IdWorker.get(); + wxActivityJoin.setId(idWorker.nextId()); wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); From 0ce8c369e6c4e92174381ef12fcd288bac0d5eff Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 16:37:16 +0800 Subject: [PATCH 106/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql | 3 +++ .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql new file mode 100644 index 000000000..9c2f8fc80 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906111630__ALTER_ACTIVITY_JOIN.sql @@ -0,0 +1,3 @@ +alter table wx_activity_join +change column nick_name nick_name varchar(20) comment '昵称', +change column answer answer json comment '答案'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 4d6951b85..b219bacea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -125,14 +125,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { + WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); //保存到报名表中 final IdWorker idWorker = IdWorker.get(); wxActivityJoin.setId(idWorker.nextId()); + wxActivityJoin.setPhone(user.getPhone()); wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { - WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); Integer userCredit = user.getCredit(); Integer credit = wxActivity.getCredit(); Map data = new HashMap<>(); From 53920cb951b6a9884474a113866056e085559a15 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 16:58:20 +0800 Subject: [PATCH 107/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 45 ++++++++++++++++--- .../com/iformall/domain/po/WxFlowConfig.java | 4 ++ .../com/iformall/domain/po/WxFlowModel.java | 1 + .../iformall/mapper/WxFlowConfigMapper.java | 6 +++ .../iformall/mapper/WxFlowModelMapper.java | 1 + .../com/iformall/service/WxFlowService.java | 14 ++++++ .../service/impl/WxFlowServiceImpl.java | 17 ++++++- .../resources/mapper/WxFlowConfigMapper.xml | 18 ++++---- .../resources/mapper/WxFlowModelMapper.xml | 4 +- 9 files changed, 93 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index a52421d14..749d8dace 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxFlowConfig; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; import com.iformall.enums.EnumFlowRecordStatus; @@ -13,6 +14,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -224,9 +226,9 @@ public class WxFlowAbleController extends BaseController { @ApiOperation(value = "删除模板") @PostMapping(value = "delModel") @SystemControllerLog(description = "工作流-删除模板") - public ResultData delModel(@ModelAttribute WxFlowModel wxFlowModel) { + public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) { wxFlowModel.setTenantId(getTenantId()); - return wxFlowService.createModel(wxFlowModel); + return wxFlowService.delModel(wxFlowModel); } /** @@ -255,10 +257,43 @@ public class WxFlowAbleController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) @SystemControllerLog(description = "工作流-配置列表") - public ResultData configList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { + public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); - wxFlowModel.setTenantId(getTenantId()); - return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); + wxFlowConfig.setTenantId(getTenantId()); + if(pageSize == null){ + pageSize = 99999999; + } + if(pageNum == null){ + pageNum = 1; + } + + PageInfo pageInfo = wxFlowService.configList(wxFlowConfig,pageNum,pageSize); + List list = pageInfo.getList(); + for (WxFlowConfig c:list) { + if(CollectionUtils.isNotEmpty(c.getChilds())){ + for (WxFlowConfig ch:c.getChilds()) { + if(ch.getModelId() != null){ + WxFlowModel query = new WxFlowModel(); + query.setId(ch.getModelId()); + ch.setWxFlowModel((WxFlowModel)wxFlowService.findModelById(query).data); + } + } + } + } + pageInfo.setList(list); + return new ResultData(pageInfo); } + /** + * 类型设置 + */ + @ApiOperation(value = "类型设置") + @PostMapping(value = "updateConfig") + @SystemControllerLog(description = "工作流-类型设置") + public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) { + wxFlowConfig.setTenantId(getTenantId()); + return wxFlowService.updateConfig(wxFlowConfig); + } + + } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index c03d8995a..00217a18b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -36,6 +37,9 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId") private Long modelId; + @io.swagger.annotations.ApiModelProperty(value="父类ID",name="parentId") + private Long parentId; + @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 9a32bcf89..7a3da5901 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.vo.UserTaskVo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java index c45553609..f9c7dfbd9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java @@ -10,4 +10,10 @@ import java.util.List; public interface WxFlowConfigMapper extends CommonMapper { List findList(WxFlowConfig wxFlowConfig); + /** + * 查找所有子 + * @return + */ + List findChildList(); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java index d49fb73a9..f55af0f39 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java @@ -12,4 +12,5 @@ import java.util.List; public interface WxFlowModelMapper extends CommonMapper { List findList(WxFlowModel wxFlowModel); + WxFlowModel selectById(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 1f67633ad..25cfc3fec 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -2,10 +2,12 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxFlowConfig; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowRecord; import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; /** @@ -112,4 +114,16 @@ public interface WxFlowService { * @return */ PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize); + + /** + * 配置列表 + * @return + */ + PageInfo configList(WxFlowConfig wxFlowConfig, Integer pageIndex, Integer pageSize); + + /** + * 类型配置 + * @return + */ + ResultData updateConfig(WxFlowConfig wxFlowConfig); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 26736dc58..3212ed947 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -97,6 +97,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxBillOtherDepositMapper wxBillOtherDepositMapper; @Autowired private WxFlowModelMapper wxFlowModelMapper; + @Autowired + private WxFlowConfigMapper wxFlowConfigMapper; /** * 获取流程key @@ -1159,9 +1161,9 @@ public class WxFlowServiceImpl implements WxFlowService { process.addFlowElement(sequenceFlow); wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); - final IdWorker idWorker = IdWorker.get(); - wxFlowModel.setId(idWorker.nextId()); if(wxFlowModel.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + wxFlowModel.setId(idWorker.nextId()); wxFlowModelMapper.insertSelective(wxFlowModel); }else{ wxFlowModel.setUpdateDate(new Date()); @@ -1230,4 +1232,15 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); return new ResultData(); } + + @Override + public PageInfo configList(WxFlowConfig wxFlowConfig, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowConfigMapper.findList(wxFlowConfig)); + } + + @Override + public ResultData updateConfig(WxFlowConfig wxFlowConfig) { + wxFlowConfigMapper.updateByPrimaryKeySelective(wxFlowConfig); + return new ResultData(); + } } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index b836d6191..a06ccfe97 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -5,20 +5,20 @@ - - + + - where 1 = 1 + where parent_id =0 and `tenant_id` = #{tenantId} @@ -26,16 +26,16 @@ and `name` like concat('%', #{name},'%') order by ${sortColumns} - order by id desc + order by id asc - + select * from wx_flow_config - - - + diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index 51fcbcd1e..7f6da0a88 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -5,7 +5,6 @@ - @@ -32,6 +31,9 @@ + From a5a06a32e8443ff78c80c0fd403846fbc1202508 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 16:56:55 +0800 Subject: [PATCH 108/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index b219bacea..62a5ac127 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -130,6 +131,9 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { final IdWorker idWorker = IdWorker.get(); wxActivityJoin.setId(idWorker.nextId()); wxActivityJoin.setPhone(user.getPhone()); + Date date = new Date(); + wxActivityJoin.setCreateTime(date); + wxActivityJoin.setUpdateTime(date); wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); From e600cf64facee2bfcbb15e1d4a1bfe9c3817e3b5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 16:57:27 +0800 Subject: [PATCH 109/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906111642__ALTER_RENT_CONTRACT.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906111642__ALTER_RENT_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906111642__ALTER_RENT_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906111642__ALTER_RENT_CONTRACT.sql new file mode 100644 index 000000000..38355ca54 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906111642__ALTER_RENT_CONTRACT.sql @@ -0,0 +1,5 @@ +alter table wx_rent_contract +add column rent_input_way smallint(2) DEFAULT 1 comment '租金录入方式1合铺录入2分铺录入', +add column adjust_ratio_way smallint(2) DEFAULT 1 comment '年租金调整方式1按比例2按金额'; + +update wx_rent_contract set rent_input_way=2 where rent_shop_type=1; From 4d52c26c750877d4018c44e8ea964557868f8da5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 17:14:21 +0800 Subject: [PATCH 110/289] =?UTF-8?q?[=E6=8A=A5=E5=90=8D=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxActivityController.java | 4 ++-- .../iformall/enums/EnumActivityEnrollStatus.java | 3 ++- .../com/iformall/service/WxActivityService.java | 2 +- .../service/impl/WxActivityServiceImpl.java | 14 +++++++++++++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java index 067b7d3c5..2d4cbd2e7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityController.java @@ -35,7 +35,7 @@ public class WxActivityController extends BaseController { @GetMapping("/queryStatus") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData queryStatus(Long id) { - return new ResultData(wxActivityService.queryStatus(id)); + return new ResultData(wxActivityService.queryStatus(id, getUserId())); } @ApiOperation("根据id查询接口") @@ -43,7 +43,7 @@ public class WxActivityController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { WxActivity wxActivity = wxActivityService.getById(id); - Integer status = wxActivityService.queryStatus(id); + Integer status = wxActivityService.queryStatus(id, getUserId()); Map data = new HashMap<>(); data.put("activity", wxActivity); data.put("status", status); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java index 93fb2005c..cce6c94b3 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumActivityEnrollStatus.java @@ -8,7 +8,8 @@ public enum EnumActivityEnrollStatus { NOT_START(0, "报名未开始"), NORMAL(1, "正常报名"), - END(2, "报名结束"),; + END(2, "报名结束"), + JOINED(3, "已报名"),; public static EnumActivityEnrollStatus getEnum(Integer code) { for (EnumActivityEnrollStatus value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java index af53f7b14..b33537888 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxActivityService.java @@ -43,6 +43,6 @@ public interface WxActivityService { ResultData sendToCampaign(Long id); - Integer queryStatus(Long id); + Integer queryStatus(Long id, Long userId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 116c9082c..d51eeba87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -7,8 +7,10 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCampaign; import com.iformall.enums.*; +import com.iformall.mapper.WxActivityJoinMapper; import com.iformall.mapper.WxActivityMapper; import com.iformall.mapper.WxCampaignMapper; import com.iformall.service.WxActivityService; @@ -41,6 +43,8 @@ public class WxActivityServiceImpl implements WxActivityService { WxCampaignService wxCampaignService; @Autowired WxCampaignMapper wxCampaignMapper; + @Autowired + WxActivityJoinMapper wxActivityJoinMapper; @Override public PageInfo listAsPage(WxActivity record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityMapper.findList(record)); @@ -167,8 +171,16 @@ public class WxActivityServiceImpl implements WxActivityService { } @Override - public Integer queryStatus(Long id) { + public Integer queryStatus(Long id, Long userId) { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); + WxActivityJoin activityJoin = new WxActivityJoin(); + activityJoin.setUserId(userId); + activityJoin.setActivityId(id); + activityJoin.setTenantId(wxActivity.getTenantId()); + int count = wxActivityJoinMapper.selectCount(activityJoin); + if (count > 0) { + return EnumActivityEnrollStatus.JOINED.getCode(); + } if (wxActivity.getStartTime().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { return EnumActivityEnrollStatus.NOT_START.getCode(); } From 6ff10ae981b056aea74096c528c6e45f6d85a792 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 17:22:19 +0800 Subject: [PATCH 111/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxFlowConfig.java | 4 ++-- .../src/main/resources/mapper/WxFlowConfigMapper.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index 00217a18b..c3ac7367c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -31,8 +31,8 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="流程类型1合同审批2账单审批3终止合同4有价卷上架",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="状态0启用 1停用",name="status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value="排序",name="sort") + private Integer sort; @io.swagger.annotations.ApiModelProperty(value="模板id",name="modelId") private Long modelId; diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index a06ccfe97..2f6edf12b 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -8,7 +8,7 @@ - + @@ -26,7 +26,7 @@ and `name` like concat('%', #{name},'%') order by ${sortColumns} - order by id asc + order by sort asc From b188f028b556c42aed8062af4bb0b952a9c6a252 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 11 Jun 2019 17:46:15 +0800 Subject: [PATCH 112/289] =?UTF-8?q?[=E4=B8=9A=E5=8A=A1=E5=88=A0=E9=99=A4][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxBrandController.java | 3 +- .../controller/market/WxCouponController.java | 3 +- .../com/iformall/domain/po/WxFlowConfig.java | 1 - .../java/com/iformall/enums/EnumDelFlag.java | 36 +++++++++++++++++++ .../service/impl/WxBrandServiceImpl.java | 3 +- 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index d8225462c..470369fda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; +import com.iformall.enums.EnumDelFlag; import com.iformall.service.WxBrandService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; @@ -66,7 +67,7 @@ public class WxBrandController extends BaseController { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); wxBrand.setTenantId(getTenantId()); - if(wxBrand.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setTenantId(wxBrand.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 3ffee76dc..ae385cb7c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -12,6 +12,7 @@ import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; +import com.iformall.enums.EnumDelFlag; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; @@ -67,7 +68,7 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - if(wxCoupon.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ WxCouponChannel query = new WxCouponChannel(); query.setTenantId(wxCoupon.getTenantId()); query.setCouponId(wxCoupon.getId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index c3ac7367c..3701ac9f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -1,6 +1,5 @@ package com.iformall.domain.po; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java b/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java new file mode 100644 index 000000000..22b57e20d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumDelFlag.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by luozukai + */ +public enum EnumDelFlag { + + YES(1, "是"), + NO(0, "否"), + ; + + public static EnumDelFlag getEnum(Integer code) { + for (EnumDelFlag value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumDelFlag(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 9d0d98c48..e6e0756d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxShop; +import com.iformall.enums.EnumDelFlag; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBrandMapper; import com.iformall.service.WxBrandService; @@ -69,7 +70,7 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public ResultData update(WxBrand wxBrand) { - if(wxBrand.getIsDel().equals(1)){ + if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ wxBrand.setUpdatetime(new Date()); wxBrandMapper.updateByPrimaryKeySelective(wxBrand); return new ResultData(Result.SUCCESS, "操作成功"); From a664b8892c02cab67d1f172f17f0c4d208b40abd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 18:09:05 +0800 Subject: [PATCH 113/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A7=9F=E8=B5=81=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8F=8A=E5=B9=B4=E7=A7=9F=E9=87=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=96=B9=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxRentContract.java | 6 +++ .../enums/EnumRentContractAdjustRatioWay.java | 37 +++++++++++++++++ .../enums/EnumRentContractRentInputWay.java | 37 +++++++++++++++++ .../impl/WxRentContractServiceImpl.java | 41 +++++++++++++------ .../resources/mapper/WxRentContractMapper.xml | 11 +++-- 5 files changed, 116 insertions(+), 16 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumRentContractAdjustRatioWay.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumRentContractRentInputWay.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 739ff60f1..47c51032a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -220,6 +220,12 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") private Integer rentStartType; + @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") + private Integer rentInputWay; + + @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") + private Integer adjustRatioWay; + // public Integer getAdjustPeriod() { // if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ // return EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode(); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractAdjustRatioWay.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractAdjustRatioWay.java new file mode 100644 index 000000000..c3ce1bcd1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractAdjustRatioWay.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + + +/** + * @author gongbiao + */ + +public enum EnumRentContractAdjustRatioWay { + + RATIO(1, "按比例"), + MONEY(2, "按金额"),; + + public static EnumRentContractAdjustRatioWay getEnum(Integer code) { + for (EnumRentContractAdjustRatioWay value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumRentContractAdjustRatioWay(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractRentInputWay.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractRentInputWay.java new file mode 100644 index 000000000..083678f64 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractRentInputWay.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + + +/** + * @author gongbiao + */ + +public enum EnumRentContractRentInputWay { + + WHOLE(1, "合铺录入"), + PART(2, "分铺录入"),; + + public static EnumRentContractRentInputWay getEnum(Integer code) { + for (EnumRentContractRentInputWay value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumRentContractRentInputWay(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index c0db34182..27b74e22b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -761,7 +761,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //计算租金,每年-每个店铺租金 - public List computePrice(String rentInfo,Integer priceUnit) { + public List computePrice(String rentInfo, WxRentContract wxRentContract) { JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); int arraySize = rentInfoArray.size(); @@ -777,18 +777,32 @@ public class WxRentContractServiceImpl implements WxRentContractService { JSONObject rentInfoObject = rentInfoArray.getJSONObject(0); JSONArray adjustRatio = rentInfoObject.getJSONArray("adjustRatio"); int adjustRatioSize = adjustRatio.size(); - - for (int i = 0; i < adjustRatioSize; i++) { - long[] priceArrs = new long[arraySize]; - for (int j = 0; j < arraySize; j++) { - rentInfoObject = rentInfoArray.getJSONObject(j); - adjustRatio = rentInfoObject.getJSONArray("adjustRatio"); - BigDecimal multiply = new BigDecimal(priceList.get(i)[j]).multiply(new BigDecimal(adjustRatio.getString(i)).divide(new BigDecimal(100))); - BigDecimal price = new BigDecimal(priceList.get(i)[j]).add(multiply); - priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).longValue(); + //判断年租金调整方式 + if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) { + for (int i = 0; i < adjustRatioSize; i++) { + long[] priceArrs = new long[arraySize]; + for (int j = 0; j < arraySize; j++) { + rentInfoObject = rentInfoArray.getJSONObject(j); + adjustRatio = rentInfoObject.getJSONArray("adjustRatio"); + BigDecimal multiply = new BigDecimal(priceList.get(i)[j]).multiply(new BigDecimal(adjustRatio.getString(i)).divide(new BigDecimal(100))); + BigDecimal price = new BigDecimal(priceList.get(i)[j]).add(multiply); + priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).longValue(); + } + priceList.add(priceArrs); + } + } else { + for (int i = 0; i < adjustRatioSize; i++) { + long[] priceArrs = new long[arraySize]; + for (int j = 0; j < arraySize; j++) { + rentInfoObject = rentInfoArray.getJSONObject(j); + adjustRatio = rentInfoObject.getJSONArray("adjustRatio"); + BigDecimal price = new BigDecimal(priceList.get(i)[j]).add(new BigDecimal(adjustRatio.getString(i))); + priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).longValue(); + } + priceList.add(priceArrs); } - priceList.add(priceArrs); } + return priceList; } @@ -797,10 +811,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { long[] priceArrs = null; List> shopInfos = new ArrayList<>(); if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) && + wxRentContract.getRentInputWay().equals(EnumRentContractRentInputWay.PART.getCode()) && !wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { String rentInfo = wxRentContract.getRentInfo(); JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); - List priceList = computePrice(rentInfo,wxRentContract.getPriceUnit()); + List priceList = computePrice(rentInfo, wxRentContract); size = priceList.size(); priceArrs = new long[size]; for (int i = 0; i < size; i++) { @@ -1693,7 +1708,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } adjustRatioList.add(adjustRatioStr.toString()); } - List priceList = computePrice(rentInfo,wxRentContract.getPriceUnit()); + List priceList = computePrice(rentInfo, wxRentContract); int size = priceList.size(); priceArrs = new long[size]; for (int i = 0; i < size; i++) { diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 089abc2d5..aa31e9a19 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -48,7 +48,10 @@ - + + + + @@ -58,7 +61,8 @@ `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, - `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type + `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type, + `rent_input_way`,`adjust_ratio_way` @@ -118,7 +122,8 @@ rc.start_date startDate,rc.end_date endDate,br.`name` brandName,rc.apply_status applyStatus,rc.bank_name bankName,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate ,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names - fileNames,rc.price_unit,rc.subject_name subjectName + fileNames,rc.price_unit,rc.subject_name subjectName,rc.`rent_input_way` rentInputWay,rc.`adjust_ratio_way` + adjustRatioWay from wx_rent_contract rc left join wx_shop s on rc.shop_id=s.id left join wx_mall_floor f on s.floor=f.id From a015554b940367b94a9ab86aef2edb07d65476e4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 19:12:12 +0800 Subject: [PATCH 114/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index db9ab4a15..957650714 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -16,7 +16,7 @@ - + From 5b516ce72aaba34b68ccd5b668368791ccdd0d03 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 11 Jun 2019 19:13:08 +0800 Subject: [PATCH 115/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=85=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentPropertyContractController.java | 301 ++++++++++++++++++ 1 file changed, 301 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java new file mode 100644 index 000000000..866353674 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -0,0 +1,301 @@ +package com.iformall.controller.contract; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumRentStartType; +import com.iformall.mapper.WxRentContractMapper; +import com.iformall.service.WxBillRentService; +import com.iformall.service.WxPayAccountBillService; +import com.iformall.service.WxRentContractService; +import com.iformall.service.WxShopService; +import com.iformall.utils.DateUtils; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @author gongbiao + */ +@RestController +@RequestMapping("wxRentPropertyContract") +public class WxRentPropertyContractController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxRentContractService wxRentContractService; + @Autowired + private WxBillRentService wxBillRentService; + @Autowired + private WxPayAccountBillService payAccountBillService; + @Autowired + private WxShopService wxShopService; + @Autowired + private WxRentContractMapper wxRentContractMapper; + + @GetMapping("getDateDiff") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), + @ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)}) + @SystemControllerLog(description = "获取两个时间相差,返回n月零n天") + public ResultData getDateDiff(String startDate, String endDate) throws Exception { + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + Map map = new HashMap<>(); + int[] array = DateUtils.getDiff(sd.parse(startDate), sd.parse(endDate)); + map.put("month", array[0]); + map.put("day", array[1]); + return new ResultData(map); + } + + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "租赁合同-列表") + public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::list"); + if (null == wxRentContract) { + wxRentContract = new WxRentContract(); + } + wxRentContract.setTenantId(getTenantId()); + Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); + return new ResultData(result); + } + + @PostMapping("add") + @SystemControllerLog(description = "租赁合同-添加") + public ResultData add(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); + + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); + if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + return wxRentContractService.save(wxRentContract, user.getId(), user.getName(), oldDate); + } + + @PostMapping("updateRentStartTime") + @SystemControllerLog(description = "租赁合同-更新租赁开始日期") + public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); + WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); + Date oldDate = wxRentContract.getRentalStartDate(); + if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + rentContract.setRentalStartDate(rentContract.getStartDate()); + } + MallUserInfo user = getUser(); + rentContract.setTenantId(user.getTenantId()); + rentContract.setAdjustPeriodHandle(); + rentContract.setRentPriceHandle(); + return wxRentContractService.update(rentContract, user.getId(), user.getName(), 1, oldDate); + } + + @PostMapping("update") + @SystemControllerLog(description = "租赁合同-更新") + public ResultData update(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::update"); + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + wxRentContract.setRentPriceHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); + if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + return wxRentContractService.update(wxRentContract, user.getId(), user.getName(), 0, oldDate); + } + + /** + * 防止前端3秒重复提交 + * + * @param wxRentContract + * @return + */ + @PostMapping("updateMoney") + @SystemControllerLog(description = "租赁合同-更新金额") + public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + wxRentContract.setRentPriceHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); + if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + return wxRentContractService.update(wxRentContract, user.getId(), user.getName(), 0, oldDate); + } + + @PostMapping("updateFile") + @SystemControllerLog(description = "租赁合同-更新文件") + public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + wxRentContract.setRentPriceHandle(); + Date oldDate = wxRentContract.getRentalStartDate(); + if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + return wxRentContractService.updateFile(wxRentContract, user.getId(), user.getName(), oldDate); + } + + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) + @SystemControllerLog(description = "租赁合同-删除") + public ResultData delete(String id) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::delete"); + return wxRentContractService.deleteById(id); + } + + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "租赁合同-查找") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); + // 同步欠缴状态 + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setTenantId(getTenantId()); + wxBillRentService.updateBillStatus(wxBillRent); + return wxRentContractService.getById(id); + } + + @RequestMapping("/download") + public void download(HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); + wxRentContractService.download(request, response, getTenantId()); + } + + @GetMapping("/getRentContractStatusInfo") + @SystemControllerLog(description = "租赁合同-获取合同状态信息") + public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); + } + + @GetMapping("/endRentContract") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "status", value = "status", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "租赁合同-终结合同") + public ResultData endRentContract(Long id, Integer status) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::endRentContract"); + return wxRentContractService.endRentContract(id, status); + } + + @PostMapping("updateMerchant") + @SystemControllerLog(description = "租赁合同-更新商户") + public ResultData updateMerchant(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMerchant"); + return wxRentContractService.updateMerchant(wxRentContract); + } + + @GetMapping("getRentContractList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "租赁合同-列表") + public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); + } + + @GetMapping("exportContract") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)}) + @SystemControllerLog(description = "租赁合同-导出合同") + public void exportContract(Long id, HttpServletRequest request, HttpServletResponse response) { + wxRentContractService.exportContract(request, response, getTenantId(), id); + } + + @GetMapping("updateRentContractStatus") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "租赁合同-更新合同状态") + public ResultData updateRentContractStatus(Long id) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); + return wxRentContractService.updateRentContractStatus(id); + } + + @GetMapping("getPayAccountInfo") + @SystemControllerLog(description = "租赁合同-获取甲方账户") + public ResultData getPayAccountInfo() { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); + String tenantId = getTenantId(); + WxPayAccountBill payAccountBill = payAccountBillService.getByTenantId(tenantId); + Map map = new HashMap<>(); + if (StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { + map.put("bankAccountName", payAccountBill.getBankAccountName()); + map.put("bankCardId", payAccountBill.getBankCardId()); + } + return new ResultData(map); + } + + @PostMapping("savePayAccountInfo") + @SystemControllerLog(description = "租赁合同-保存甲方账户") + public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); + if (StringUtils.isBlank(payAccountBill.getBankAccountName())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "甲方银行账户名未填写"); + } + if (StringUtils.isBlank(payAccountBill.getBankCardId())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "甲方银行账户卡号未填写"); + } + String tenantId = getTenantId(); + WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(tenantId); + payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); + payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); + payAccountBillService.saveOrUpdate(payAccountBillNew); + return new ResultData(); + } + + @GetMapping("/getMerchants") + @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") + public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); + wxRentContract.setTenantId(getTenantId()); + return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); + } + + @GetMapping("/hasRentStatus") + @SystemControllerLog(description = "查询店铺租赁状态") + public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); + wxRentContract.setTenantId(getTenantId()); + return wxRentContractService.hasRentStatus(wxRentContract); + } + + @GetMapping("/hasContractNumber") + @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") + public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); + wxRentContract.setTenantId(getTenantId()); + return wxRentContractService.hasContractNumber(wxRentContract); + } + +} + + From 7d9b8401a53c5092ba2aeb1fd013f72d9638d3e1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 11 Jun 2019 20:29:55 +0800 Subject: [PATCH 116/289] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97][=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906111925__ADD_MENU.sql | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906111925__ADD_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906111925__ADD_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906111925__ADD_MENU.sql new file mode 100644 index 000000000..8738b850a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906111925__ADD_MENU.sql @@ -0,0 +1,33 @@ +INSERT INTO `mall_permission` + (`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`) +VALUES + (591, '系统日志', 50, 'Y', null, 0, null, null, null, 'icon-xitongguanli', 0, 591), + (595, '日志列表', 591, 'Y', null, 1, null, null, 'systemLog', null, 0, 595); + +UPDATE `mall_permission` set `module_color` = '#09BB07' WHERE id = 50; + +DROP TABLE IF EXISTS `mall_sale_type` ; +CREATE TABLE `mall_sale_type` ( + `id` bigint(64) NOT NULL, + `name` varchar(32) DEFAULT NULL COMMENT '销售类型', + `type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版', + `period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)', + `menus` json DEFAULT NULL COMMENT '菜单列表', + PRIMARY KEY (`id`), + UNIQUE `id_UNIQUE` USING BTREE (`id`) comment '' +) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0; + +INSERT INTO `mall_sale_type` + (`id`,`name`, `type`, `period`, `menus`) +VALUES + (1, '尊享全能版', 1, 12, + '[1,2,3,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]' + ), + (2, '尊享营销版', 2, 12, + '[1,2,4,5,6,7,8,9,10,50,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,591,595,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]' + ), + (3, '速享版', 3, 1, + '[2,4,5,6,7,10,50,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,591,592,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932]' + ) + + ; \ No newline at end of file From b1a892556026b9d19f30965a87360ca1cedb1247 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 12 Jun 2019 11:41:40 +0800 Subject: [PATCH 117/289] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97][=E4=BF=AE=E6=94=B9]:=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/vo/MallUserActionVo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java index ec8d78626..d461d8289 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -1,18 +1,21 @@ package com.iformall.domain.vo; - import com.iformall.domain.po.MallUserAction; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; + /** * Created by syf on 2018/8/30. */ @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class MallUserActionVo extends MallUserAction { +public class MallUserActionVo extends MallUserAction { + @io.swagger.annotations.ApiModelProperty(value="访问时间",name="actionTime") + private Date actionTime; @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; From 143834b257da9a2828e6b081bc0ec3d0773d1e50 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 12 Jun 2019 11:42:04 +0800 Subject: [PATCH 118/289] =?UTF-8?q?[=E7=94=A8=E6=88=B7][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/MallUserInfo.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 764675c3d..1b35af1e6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -30,14 +30,6 @@ public class MallUserInfo extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { From af7e5e61bec2c9ff42d7499b32513e1930d43f52 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 12 Jun 2019 14:02:46 +0800 Subject: [PATCH 119/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 2 +- .../com/iformall/domain/vo/FlowUserVo.java | 2 +- .../service/impl/WxFlowServiceImpl.java | 98 +++++++++---------- .../resources/mapper/WxFlowConfigMapper.xml | 1 - 4 files changed, 46 insertions(+), 57 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 749d8dace..ac83974f9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -261,7 +261,7 @@ public class WxFlowAbleController extends BaseController { logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); wxFlowConfig.setTenantId(getTenantId()); if(pageSize == null){ - pageSize = 99999999; + pageSize = Integer.MAX_VALUE; } if(pageNum == null){ pageNum = 1; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java index 849c9d845..06808a6ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java @@ -9,7 +9,7 @@ public class FlowUserVo implements Serializable{ private static final long serialVersionUID = 1L; @io.swagger.annotations.ApiModelProperty(value="用户id",name="id") - private Long id; + private String id; @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 3212ed947..29f56424a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1145,20 +1145,31 @@ public class WxFlowServiceImpl implements WxFlowService { Process process = new Process(); BpmnModel bpmnModel = new BpmnModel(); - StartEvent start = new StartEvent(); - start.setId("start"); - start.setName("开始节点"); - - SequenceFlow sequenceFlow = new SequenceFlow(); - sequenceFlow.setId("sf1"); - sequenceFlow.setName("开始节点"); - sequenceFlow.setSourceRef("start"); - sequenceFlow.setTargetRef("userTask1"); - - start.setOutgoingFlows(Arrays.asList(sequenceFlow)); + List flowList = createFlow(wxFlowModel.getLists().size()); + + for (int i = 0; i < wxFlowModel.getLists().size(); i++){ + if(i==0){ + StartEvent start = new StartEvent(); + start.setId("start"); + start.setName("开始节点"); + start.setOutgoingFlows(Arrays.asList(flowList.get(0))); + process.addFlowElement(start); + process.addFlowElement(flowList.get(0)); + }else if(i==wxFlowModel.getLists().size()-1){ + EndEvent endEvent = new EndEvent(); + endEvent.setId("end"); + endEvent.setName("结束节点"); + endEvent.setIncomingFlows(Arrays.asList(flowList.get(i+1))); + } - process.addFlowElement(start); - process.addFlowElement(sequenceFlow); + UserTask userTask = new UserTask(); + userTask.setName("节点"+i); + userTask.setId("userTask"+i); + userTask.setIncomingFlows(Arrays.asList(flowList.get(i))); + userTask.setOutgoingFlows(Arrays.asList(flowList.get(i+1))); + process.addFlowElement(userTask); + process.addFlowElement(flowList.get(i+1)); + } wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); if(wxFlowModel.getId() == null) { @@ -1172,51 +1183,30 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(); } - public UserTask draw(Process process,SequenceFlow incoming,List lists,int count){ - if(CollectionUtils.isNotEmpty(lists)){ - UserTaskVo taskVo = lists.get(0); - lists.remove(0); - - UserTask userTask = new UserTask(); - if(taskVo.getType().equals(EnumTaskType.NORMAL.getCode())){ - userTask.setName(count+"级审批"); - userTask.setId("userTask"+count); - userTask.setIncomingFlows(Arrays.asList(incoming)); - List userIdList = new ArrayList<>(); - for (FlowUserVo userVo:taskVo.getUserList()) { - userIdList.add(userVo.getId()+""); - } - userTask.setCandidateUsers(userIdList); - }else if(taskVo.getType().equals(EnumTaskType.AND.getCode())){ - MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); - - userTask.setLoopCharacteristics(mi); - }else if(taskVo.getType().equals(EnumTaskType.OR.getCode())){ - + public List createFlow(int size){ + List result = new ArrayList<>(); + for (int i = 0; i < size+1; i++) { + SequenceFlow sequenceFlow = new SequenceFlow(); + sequenceFlow.setId("sf"+i); + if(i==0){ + sequenceFlow.setName("开始"); + sequenceFlow.setSourceRef("start"); + sequenceFlow.setTargetRef("userTask"+i); + }else if(i == size){ + sequenceFlow.setName("结束"); + sequenceFlow.setSourceRef("userTask"+i); + sequenceFlow.setTargetRef("end"); + }else{ + sequenceFlow.setName("sf"+i); + sequenceFlow.setSourceRef("userTask"+i); + sequenceFlow.setTargetRef("userTask"+i); } - - - - SequenceFlow out = new SequenceFlow(); - out.setId("sf"+count); - out.setName("节点"+count); - out.setSourceRef(userTask.getId()); - - userTask.setOutgoingFlows(Arrays.asList(out)); - - UserTask next = draw(process,out,lists,count++); - - out.setTargetFlowElement(next); - return next; - }else{ - return null; + result.add(sequenceFlow); } - - - - + return result; } + @Override public PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowModelMapper.findList(wxFlowModel)); diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 2f6edf12b..8b1237f7e 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -24,7 +24,6 @@ and `id` = #{id} and `name` like concat('%', #{name},'%') - order by ${sortColumns} order by sort asc From 6fb6208f25d5cecfad2c03e1aa4324e0674b1465 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 14:09:49 +0800 Subject: [PATCH 120/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E6=98=B5=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxActivityJoinController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 99282b825..75375e299 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -48,6 +48,7 @@ public class WxActivityJoinController extends BaseController { } wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setUserId(getUserId()); + wxActivityJoin.setNickName(getUser().getNickName()); return wxActivityJoinService.join(wxActivityJoin); } From 758092971e7db46d83638dec09b73eea056566f8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 14:29:53 +0800 Subject: [PATCH 121/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 957650714..e2f0ac40e 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -36,9 +36,9 @@ and `tenant_id` = #{tenantId} - and `name` = #{name} + and `name` like concat('%', #{name},'%') - + and `phone` = #{phone} From 888c9f2a53429ed4103adbfd16a02bf2ac243e91 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 14:31:31 +0800 Subject: [PATCH 122/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=AE=9E=E4=BD=93VO]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentPropertyContractController.java | 265 +----------------- .../domain/vo/WxRentPropertyContractVo.java | 264 +++++++++++++++++ 2 files changed, 270 insertions(+), 259 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 866353674..7b919a902 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -1,34 +1,20 @@ package com.iformall.controller.contract; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillRent; -import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; -import com.iformall.enums.EnumRentStartType; -import com.iformall.mapper.WxRentContractMapper; -import com.iformall.service.WxBillRentService; -import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxRentContractService; -import com.iformall.service.WxShopService; -import com.iformall.utils.DateUtils; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; import java.util.Map; /** @@ -41,36 +27,14 @@ public class WxRentPropertyContractController extends BaseController { @Autowired private WxRentContractService wxRentContractService; - @Autowired - private WxBillRentService wxBillRentService; - @Autowired - private WxPayAccountBillService payAccountBillService; - @Autowired - private WxShopService wxShopService; - @Autowired - private WxRentContractMapper wxRentContractMapper; - - @GetMapping("getDateDiff") - @ApiImplicitParams({ - @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), - @ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)}) - @SystemControllerLog(description = "获取两个时间相差,返回n月零n天") - public ResultData getDateDiff(String startDate, String endDate) throws Exception { - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - Map map = new HashMap<>(); - int[] array = DateUtils.getDiff(sd.parse(startDate), sd.parse(endDate)); - map.put("month", array[0]); - map.put("day", array[1]); - return new ResultData(map); - } @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "租赁合同-列表") + @SystemControllerLog(description = "租赁物业合同-列表") public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::list"); + logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::list"); if (null == wxRentContract) { wxRentContract = new WxRentContract(); } @@ -79,223 +43,6 @@ public class WxRentPropertyContractController extends BaseController { return new ResultData(result); } - @PostMapping("add") - @SystemControllerLog(description = "租赁合同-添加") - public ResultData add(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); - - MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - Date oldDate = wxRentContract.getRentalStartDate(); - if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); - } - return wxRentContractService.save(wxRentContract, user.getId(), user.getName(), oldDate); - } - - @PostMapping("updateRentStartTime") - @SystemControllerLog(description = "租赁合同-更新租赁开始日期") - public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); - WxRentContract rentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); - rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); - Date oldDate = wxRentContract.getRentalStartDate(); - if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - rentContract.setRentalStartDate(rentContract.getStartDate()); - } - MallUserInfo user = getUser(); - rentContract.setTenantId(user.getTenantId()); - rentContract.setAdjustPeriodHandle(); - rentContract.setRentPriceHandle(); - return wxRentContractService.update(rentContract, user.getId(), user.getName(), 1, oldDate); - } - - @PostMapping("update") - @SystemControllerLog(description = "租赁合同-更新") - public ResultData update(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::update"); - MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - wxRentContract.setRentPriceHandle(); - Date oldDate = wxRentContract.getRentalStartDate(); - if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); - } - return wxRentContractService.update(wxRentContract, user.getId(), user.getName(), 0, oldDate); - } - - /** - * 防止前端3秒重复提交 - * - * @param wxRentContract - * @return - */ - @PostMapping("updateMoney") - @SystemControllerLog(description = "租赁合同-更新金额") - public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); - MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - wxRentContract.setRentPriceHandle(); - Date oldDate = wxRentContract.getRentalStartDate(); - if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); - } - return wxRentContractService.update(wxRentContract, user.getId(), user.getName(), 0, oldDate); - } - - @PostMapping("updateFile") - @SystemControllerLog(description = "租赁合同-更新文件") - public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); - MallUserInfo user = getUser(); - wxRentContract.setTenantId(user.getTenantId()); - wxRentContract.setAdjustPeriodHandle(); - wxRentContract.setRentPriceHandle(); - Date oldDate = wxRentContract.getRentalStartDate(); - if (wxRentContract.getRentStartType() != null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); - } - return wxRentContractService.updateFile(wxRentContract, user.getId(), user.getName(), oldDate); - } - - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) - @SystemControllerLog(description = "租赁合同-删除") - public ResultData delete(String id) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::delete"); - return wxRentContractService.deleteById(id); - } - - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "租赁合同-查找") - public ResultData findById(Long id) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); - // 同步欠缴状态 - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setTenantId(getTenantId()); - wxBillRentService.updateBillStatus(wxBillRent); - return wxRentContractService.getById(id); - } - - @RequestMapping("/download") - public void download(HttpServletRequest request, HttpServletResponse response) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); - wxRentContractService.download(request, response, getTenantId()); - } - - @GetMapping("/getRentContractStatusInfo") - @SystemControllerLog(description = "租赁合同-获取合同状态信息") - public ResultData getRentContractStatusInfo(@ModelAttribute WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractStatusInfo"); - wxRentContract.setTenantId(getTenantId()); - return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getRentContractStatusInfo(wxRentContract)); - } - - @GetMapping("/endRentContract") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true), - @ApiImplicitParam(name = "status", value = "status", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "租赁合同-终结合同") - public ResultData endRentContract(Long id, Integer status) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::endRentContract"); - return wxRentContractService.endRentContract(id, status); - } - - @PostMapping("updateMerchant") - @SystemControllerLog(description = "租赁合同-更新商户") - public ResultData updateMerchant(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMerchant"); - return wxRentContractService.updateMerchant(wxRentContract); - } - - @GetMapping("getRentContractList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - @SystemControllerLog(description = "租赁合同-列表") - public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); - wxRentContract.setTenantId(getTenantId()); - return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); - } - - @GetMapping("exportContract") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)}) - @SystemControllerLog(description = "租赁合同-导出合同") - public void exportContract(Long id, HttpServletRequest request, HttpServletResponse response) { - wxRentContractService.exportContract(request, response, getTenantId(), id); - } - - @GetMapping("updateRentContractStatus") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "租赁合同-更新合同状态") - public ResultData updateRentContractStatus(Long id) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - return wxRentContractService.updateRentContractStatus(id); - } - - @GetMapping("getPayAccountInfo") - @SystemControllerLog(description = "租赁合同-获取甲方账户") - public ResultData getPayAccountInfo() { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - String tenantId = getTenantId(); - WxPayAccountBill payAccountBill = payAccountBillService.getByTenantId(tenantId); - Map map = new HashMap<>(); - if (StringUtils.isNotBlank(payAccountBill.getBankAccountName()) && StringUtils.isNotBlank(payAccountBill.getBankCardId())) { - map.put("bankAccountName", payAccountBill.getBankAccountName()); - map.put("bankCardId", payAccountBill.getBankCardId()); - } - return new ResultData(map); - } - - @PostMapping("savePayAccountInfo") - @SystemControllerLog(description = "租赁合同-保存甲方账户") - public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - if (StringUtils.isBlank(payAccountBill.getBankAccountName())) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "甲方银行账户名未填写"); - } - if (StringUtils.isBlank(payAccountBill.getBankCardId())) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "甲方银行账户卡号未填写"); - } - String tenantId = getTenantId(); - WxPayAccountBill payAccountBillNew = payAccountBillService.getByTenantId(tenantId); - payAccountBillNew.setBankAccountName(payAccountBill.getBankAccountName()); - payAccountBillNew.setBankCardId(payAccountBill.getBankCardId()); - payAccountBillService.saveOrUpdate(payAccountBillNew); - return new ResultData(); - } - - @GetMapping("/getMerchants") - @SystemControllerLog(description = "租赁合同-获取已签约租赁合同且未有物业的商户") - public ResultData getMerchants(@ModelAttribute WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getMerchants"); - wxRentContract.setTenantId(getTenantId()); - return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); - } - - @GetMapping("/hasRentStatus") - @SystemControllerLog(description = "查询店铺租赁状态") - public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); - wxRentContract.setTenantId(getTenantId()); - return wxRentContractService.hasRentStatus(wxRentContract); - } - - @GetMapping("/hasContractNumber") - @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") - public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); - wxRentContract.setTenantId(getTenantId()); - return wxRentContractService.hasContractNumber(wxRentContract); - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java new file mode 100644 index 000000000..9b78c87c6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -0,0 +1,264 @@ +package com.iformall.domain.vo; + +import com.iformall.common.SortColumn; +import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author gongbiao + */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxRentPropertyContractVo extends BaseEntity { + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + + @Transient + @SortColumn(column = "shopNumber") + private String shopNumber; + + @Transient + private String building; + + @Transient + private String floor; + + @Transient + private String brandName; + + @Transient + private String buildArea; + + @Transient + private String priceStr; + + @Transient + private String depositStr; + + @Transient + @SortColumn(column = "allPeriod") + private Integer allPeriod; + + @Transient + @SortColumn(column = "period") + private Integer period; + + @Transient + @SortColumn(column = "needPay") + private Integer needPay; + + @Transient + @SortColumn(column = "receivePay") + private Integer receivePay; + + @Transient + @SortColumn(column = "owe") + private Integer owe; + + @Transient + @SortColumn(column = "receiveDate") + private String receiveDate; + + @Transient + @SortColumn(column = "latePayPrice") + private Integer latePayPrice; + + @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") + private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") + private Long price; + @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") + private Date rentalStartDate; + @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") + private Date rentalEndDate; + @io.swagger.annotations.ApiModelProperty(value = "签定合同时间", name = "signDate") + private Date signDate; + @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") + private Integer receivePeriod; + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") + private String tenantId; + @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") + private String filepath; + @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") + private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") + private String contractNumber; + @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") + private Long deposit; + + @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") + @SortColumn(column = "payDate") + private Integer payDate; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") + private String merchantName; + @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") + private Long brand; + @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") + private Integer businessId; + @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") + private Integer shopType; + @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") + private Long shopId; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") + private Date updatetime; + + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") + private Date createtime; + + @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") + private String rentArea; + + @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") + private String linkPerson; + + @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") + private String linkPhone; + + @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") + private String payAccount; + + @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") + private String filename; + + @io.swagger.annotations.ApiModelProperty(value = "租期(月)", name = "lease") + private Integer lease; + + @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") + private Integer type; + + @io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio") + private String adjustRatio; + + @io.swagger.annotations.ApiModelProperty(value = "计租周期 1日2月", name = "adjustPeriod") + private Integer adjustPeriod; + + @io.swagger.annotations.ApiModelProperty(value = "支付比例", name = "payRatio") + private Integer payRatio; + + @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") + private Long revenue; + + @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate") + private Date startDate; + + @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate") + private Date endDate; + + @io.swagger.annotations.ApiModelProperty(value = "审核状态,0未审核 1审核中 2审核通过 3驳回", name = "applyStatus") + private Integer applyStatus; + + @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") + private String bankName; + + @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") + private Integer rentShopType; + + @io.swagger.annotations.ApiModelProperty(value = "装修期开始时间", name = "fixStartDate") + private Date fixStartDate; + + @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") + private Date fixEndDate; + + @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") + private String rentInfo; + + @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") + private String fileNames; + + @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") + private Integer priceUnit; + + @io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit") + private String rentPrice; + + @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") + private String subjectName; + + @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") + private Integer rentStartType; + + @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") + private Integer rentInputWay; + + @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") + private Integer adjustRatioWay; + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` 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(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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new 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)); + } + } + +} + From da3d641181687f97d88266da8067aaf7cdeecf94 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 12 Jun 2019 14:35:05 +0800 Subject: [PATCH 123/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][init]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/workflow/WxFlowAbleController.java | 1 + .../com/iformall/service/impl/WxFlowServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/WxFlowConfigMapper.xml | 10 +++++----- .../src/main/resources/mapper/WxFlowModelMapper.xml | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index ac83974f9..19cdc6051 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -267,6 +267,7 @@ public class WxFlowAbleController extends BaseController { pageNum = 1; } + wxFlowConfig.setParentId(0l); PageInfo pageInfo = wxFlowService.configList(wxFlowConfig,pageNum,pageSize); List list = pageInfo.getList(); for (WxFlowConfig c:list) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 29f56424a..0a3656223 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1219,6 +1219,14 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData delModel(WxFlowModel wxFlowModel) { + WxFlowConfig query = new WxFlowConfig(); + query.setTenantId(wxFlowModel.getTenantId()); + query.setModelId(wxFlowModel.getId()); + if(CollectionUtils.isNotEmpty(wxFlowConfigMapper.findList(query))){ + return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + + "使用该模板的审批类型。"); + } + wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 8b1237f7e..4025c48c2 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -18,12 +18,12 @@ - where parent_id =0 - - and `tenant_id` = #{tenantId} - + where 1=1 + and `parent_id` = #{parentId} + and `tenant_id` = #{tenantId} and `id` = #{id} - and `name` like concat('%', #{name},'%') + and `model_id` = #{modelId} + and `name` like concat('%', #{name},'%') order by ${sortColumns} order by sort asc diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index 7f6da0a88..b1f8dbdc5 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -19,7 +19,7 @@ and `tenant_id` = #{tenantId} and `id` = #{id} - and `name` like concat('%', #{name},'%') + and `name` like concat('%', #{name},'%') order by ${sortColumns} order by id desc From adfb06d0db195d026ed3815fdf48d3eaaf7ec2a8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 15:32:22 +0800 Subject: [PATCH 124/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=AE=9E=E4=BD=93VO]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/WxRentPropertyContractVo.java | 226 +----------------- 1 file changed, 5 insertions(+), 221 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 9b78c87c6..70f1d400c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,6 +1,5 @@ package com.iformall.domain.vo; -import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,8 +7,6 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -33,232 +30,19 @@ public class WxRentPropertyContractVo extends BaseEntity { return super.getSortColumns(); } - @Transient - @SortColumn(column = "shopNumber") - private String shopNumber; - - @Transient - private String building; - - @Transient - private String floor; - - @Transient - private String brandName; - - @Transient - private String buildArea; - - @Transient - private String priceStr; - - @Transient - private String depositStr; - - @Transient - @SortColumn(column = "allPeriod") - private Integer allPeriod; - - @Transient - @SortColumn(column = "period") - private Integer period; - - @Transient - @SortColumn(column = "needPay") - private Integer needPay; - - @Transient - @SortColumn(column = "receivePay") - private Integer receivePay; - - @Transient - @SortColumn(column = "owe") - private Integer owe; - - @Transient - @SortColumn(column = "receiveDate") - private String receiveDate; - - @Transient - @SortColumn(column = "latePayPrice") - private Integer latePayPrice; - - @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") - private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") - private Long price; - @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") - private Date rentalStartDate; - @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") - private Date rentalEndDate; - @io.swagger.annotations.ApiModelProperty(value = "签定合同时间", name = "signDate") - private Date signDate; - @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") - private Integer receivePeriod; - @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") - private String tenantId; - @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") - private String filepath; - @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") - private Integer status; @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") private String contractNumber; - @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") - private Long deposit; - - @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") - @SortColumn(column = "payDate") - private Integer payDate; - @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") - private Integer isDel; - @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") - private String merchantName; - @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") - private Long brand; - @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") - private Integer businessId; - @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") - private Integer shopType; - @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") - private Long shopId; - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") - private Date updatetime; - - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") - private Date createtime; - - @io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea") - private String rentArea; - @io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson") - private String linkPerson; - - @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone") - private String linkPhone; - - @io.swagger.annotations.ApiModelProperty(value = "付款账号", name = "payAccount") - private String payAccount; - - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "filename") - private String filename; - - @io.swagger.annotations.ApiModelProperty(value = "租期(月)", name = "lease") - private Integer lease; - - @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") - private Integer type; - - @io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio") - private String adjustRatio; - - @io.swagger.annotations.ApiModelProperty(value = "计租周期 1日2月", name = "adjustPeriod") - private Integer adjustPeriod; - - @io.swagger.annotations.ApiModelProperty(value = "支付比例", name = "payRatio") - private Integer payRatio; - - @io.swagger.annotations.ApiModelProperty(value = "营业额", name = "revenue") - private Long revenue; - - @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate") - private Date startDate; - - @io.swagger.annotations.ApiModelProperty(value = "起租结束时间", name = "rentalEndDate") - private Date endDate; - - @io.swagger.annotations.ApiModelProperty(value = "审核状态,0未审核 1审核中 2审核通过 3驳回", name = "applyStatus") - private Integer applyStatus; - - @io.swagger.annotations.ApiModelProperty(value = "开户行", name = "bankName") - private String bankName; - - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") - private Integer rentShopType; - - @io.swagger.annotations.ApiModelProperty(value = "装修期开始时间", name = "fixStartDate") - private Date fixStartDate; - - @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") - private Date fixEndDate; + @io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber") + private String shopNumber; - @io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo") + @io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "rentInfo") private String rentInfo; - @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") - private String fileNames; - - @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") - private Integer priceUnit; - - @io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit") - private String rentPrice; - - @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") - private String subjectName; - - @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - private Integer rentStartType; - - @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") - private Integer rentInputWay; - - @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") - private Integer adjustRatioWay; - - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` 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(); - } - } + @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") + private String merchantName; - public void setSortColumns(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()); - } - this.sortColumns = sb.toString(); - } - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new 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)); - } - } } From b605c070953c73e087299dafa4da73b4814c1ffa Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 15:33:10 +0800 Subject: [PATCH 125/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index e2f0ac40e..a0d4d7fb7 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -50,6 +50,9 @@ and `status` = #{status} + + and `activity_id` = #{activityId} + and id in From 73f7f98e41aa51b443e3a79513aecde2f5d2d5f1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 16:21:28 +0800 Subject: [PATCH 126/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 62a5ac127..25f823853 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -10,7 +10,6 @@ import com.iformall.domain.po.WxActivity; import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.msg.WxMsgRecord; -import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.enums.*; import com.iformall.mapper.WxActivityJoinMapper; import com.iformall.mapper.WxActivityMapper; @@ -87,7 +86,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); String title = wxActivity.getTitle(); List list = wxActivityJoinMapper.findList(wxActivityJoin); - excelService.exportExcel(list, null, title, WxBillDailyVo.class, "报名表.xlsx", response, false); + excelService.exportExcel(list, title, title, WxActivityJoin.class, "报名表.xlsx", response, false); } @Override From 7a992309d5484aa6f5b8fc87c83061d09462c45f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 16:23:15 +0800 Subject: [PATCH 127/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E5=8F=8A=E5=AD=97=E6=AE=B5?= =?UTF-8?q?sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentPropertyContractController.java | 17 +++++------ .../V201906121607__ALTER_CONTRACT.sql | 4 +++ .../domain/po/WxPropertyContract.java | 3 ++ .../iformall/domain/po/WxRentContract.java | 4 +++ .../domain/vo/WxRentPropertyContractVo.java | 30 +++++++++++++++++-- .../service/WxRentContractService.java | 5 ++++ .../impl/WxRentContractServiceImpl.java | 6 ++++ 7 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906121607__ALTER_CONTRACT.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 7b919a902..24e40337f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -1,9 +1,10 @@ package com.iformall.controller.contract; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.service.WxRentContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -15,8 +16,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - /** * @author gongbiao */ @@ -33,14 +32,14 @@ public class WxRentPropertyContractController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "租赁物业合同-列表") - public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::list"); - if (null == wxRentContract) { - wxRentContract = new WxRentContract(); + if (null == wxRentPropertyContractVo) { + wxRentPropertyContractVo = new WxRentPropertyContractVo(); } - wxRentContract.setTenantId(getTenantId()); - Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); - return new ResultData(result); + wxRentPropertyContractVo.setTenantId(getTenantId()); + final PageInfo page = wxRentContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + return new ResultData(page); } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906121607__ALTER_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906121607__ALTER_CONTRACT.sql new file mode 100644 index 000000000..ab5596e30 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906121607__ALTER_CONTRACT.sql @@ -0,0 +1,4 @@ +#租赁合同 +alter table wx_rent_contract add column operation_type smallint(2) default 1 comment '1区分租赁物业2合并租赁物业'; +#物业合同 +alter table wx_property_contract add column operation_type smallint(2) default 1 comment '1区分租赁物业2合并租赁物业'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 858ef5d61..94b59ec05 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -180,6 +180,9 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") private Integer rentStartType; + @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") + private Integer operationType; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 47c51032a..53e619c38 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -226,6 +226,10 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") private Integer adjustRatioWay; + @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") + private Integer operationType; + + // public Integer getAdjustPeriod() { // if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ // return EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 70f1d400c..2fbd0ea91 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -7,7 +7,7 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; -import java.util.List; +import java.util.Date; /** * @author gongbiao @@ -16,11 +16,10 @@ import java.util.List; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxRentPropertyContractVo extends BaseEntity { + @Id protected Long id; - @Transient - protected List ids; @Transient protected String sortColumns; @@ -42,7 +41,32 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; + @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") + private Date rentalStartDate; + + @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") + private Date rentalEndDate; + + @io.swagger.annotations.ApiModelProperty(value = "租金", name = "rentPrice") + private String rentPrice; + + @io.swagger.annotations.ApiModelProperty(value = "物业费", name = "propertyPrice") + private String propertyPrice; + + @io.swagger.annotations.ApiModelProperty(value = "计租类型", name = "type") + private Integer type; + + @io.swagger.annotations.ApiModelProperty(value = "合同状态", name = "status") + private Integer status; + + @io.swagger.annotations.ApiModelProperty(value = "审批状态", name = "applyStatus") + private Integer applyStatus; + + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") + private String tenantId; + @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") + private Integer operationType; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index aa1f67a5d..31403379f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -1,9 +1,11 @@ package com.iformall.service; +import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; import io.swagger.models.auth.In; import javax.servlet.http.HttpServletRequest; @@ -85,4 +87,7 @@ public interface WxRentContractService { ResultData hasContractNumber(WxRentContract wxRentContract); Integer getShopType(WxRentContract wxRentContract); + + PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 27b74e22b..f9657bfbe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.BillTimeVo; +import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -1835,6 +1836,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { return wxRentContractMapper.getShopType(wxRentContract); } + @Override + public PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize) { + return null; + } + public static double getMonthNeedPay(Double price,Date start,Date end){ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); From 3b85f141df518e360672b31f0e9126a36f31cd69 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 16:37:08 +0800 Subject: [PATCH 128/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][mapper.xml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 7 ++++++- .../src/main/resources/mapper/WxRentContractMapper.xml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index ea604c4c2..fd5b78eaa 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -42,6 +42,9 @@ + + + @@ -51,7 +54,7 @@ `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, - `file_names`,price_unit,rent_price,subject_name,rent_start_type + `file_names`,price_unit,rent_price,subject_name,rent_start_type,`operation_type` @@ -87,6 +90,7 @@ and `start_date` = #{startDate} and `end_date` = #{endDate} and `rent_shop_type` = #{rentShopType} + and `operation_type` = #{operationType} and id in @@ -137,6 +141,7 @@ and rc.`apply_status` = #{applyStatus} and b.id = #{building} and f.id = #{floor} + and `operation_type` = #{operationType} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index aa31e9a19..fbdfccf50 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -51,6 +51,9 @@ + + + @@ -62,7 +65,7 @@ `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type, - `rent_input_way`,`adjust_ratio_way` + `rent_input_way`,`adjust_ratio_way`,`operation_type` @@ -98,6 +101,7 @@ and `start_date` = #{startDate} and `end_date` = #{endDate} and `rent_shop_type` = #{rentShopType} + and `operation_type` = #{operationType} and id in @@ -145,6 +149,7 @@ and rc.`apply_status` = #{applyStatus} and b.id = #{building} and f.id = #{floor} + and `operation_type` = #{operationType} order by ${sortColumns} order by rc.id desc From 4babf2f2b1db3cf4069c093d5ce62d4b8c2cb38e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 12 Jun 2019 16:59:54 +0800 Subject: [PATCH 129/289] =?UTF-8?q?[=E7=AD=89=E7=BA=A7][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- .../iformall/mapper/WxLevelConfigMapper.java | 5 ++- .../impl/WxLevelConfigServiceImpl.java | 24 +++++++------ .../resources/mapper/WxLevelConfigMapper.xml | 34 ++++++++++++++++++- 6 files changed, 54 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 004b7cf79..40fcdb811 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 6191f87b1..e1838b8ee 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 5c5226404..9508fdc07 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -3,7 +3,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(Uc0AjgkytxHHCwZrmDASWg==) password: ENC(nV4Mi3bEbBx0Fj7uUyYH55eTaqsFMjKvmNzagicH4pc=) type: com.alibaba.druid.pool.DruidDataSource diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java index 54daa248a..145072641 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxLevelConfigMapper.java @@ -8,7 +8,10 @@ import com.iformall.domain.po.WxLevelConfig; public interface WxLevelConfigMapper extends CommonMapper { List findList(WxLevelConfig wxLevelConfig); - + + int insertBatch(List list); + + int batchUpdate(List list); void deleteAll(@Param("tenantId")String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 918b8ad07..0659bae2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -132,6 +133,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { public void batchSave(String tenantId, List records) { final IdWorker idWorker = IdWorker.get(); wxLevelConfigMapper.deleteAll(tenantId); + List levelConfigs = new ArrayList<>(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() == null) { levelConfig.setId(idWorker.nextId()); @@ -141,22 +143,24 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { levelConfig.setUpdateDate(new Date()); } levelConfig.setTenantId(tenantId); - wxLevelConfigMapper.insertSelective(levelConfig); + levelConfigs.add(levelConfig); } + wxLevelConfigMapper.insertBatch(levelConfigs); } @Override public void batchUpdateCapabilities(String tenantId, List records) { - records.stream() - .filter(l->l.getId() != null && l.getCount() != null) - .forEach(l->{ - l.setUpdateDate(new Date()); + List levelConfigs = new ArrayList(); + for(WxLevelConfig levelConfig: records) { + if(levelConfig.getId() != null && levelConfig.getCount() != null) { + levelConfig.setUpdateDate(new Date()); JSONObject jo = new JSONObject(); - jo.put(CAPABILITY_SEND_CAR_COUPON,l.getCount()); - l.setCapability(jo.toJSONString()); - l.setUpdateDate(new Date()); - wxLevelConfigMapper.updateByPrimaryKeySelective(l); - }); + jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); + levelConfig.setCapability(jo.toJSONString()); + levelConfigs.add(levelConfig); + } + } + wxLevelConfigMapper.batchUpdate(levelConfigs); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index a77b6a550..7d1a68fea 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -69,8 +69,40 @@ + + insert into wx_level_config (id, tenant_id, points, level, description, create_date, update_date, + discount_enable, capability) values + + (#{item.id,jdbcType=BIGINT}, + #{item.tenantId,jdbcType=VARCHAR}, + #{item.points,jdbcType=INTEGER}, + #{item.level,jdbcType=VARCHAR}, + #{item.description,jdbcType=VARCHAR}, + #{item.createDate,jdbcType=TIMESTAMP}, + #{item.updateDate,jdbcType=TIMESTAMP}, + #{item.discountEnable,jdbcType=SMALLINT}, + #{item.capability,jdbcType=VARCHAR}) + + + + + + update wx_level_config + + `tenant_id` = #{item.tenantId}, + `points` = #{item.points}, + `level` = #{item.level}, + `description` = #{item.description}, + `update_date` = #{item.updateDate}, + `discount_enable` = #{item.discountEnable}, + `capability` = #{item.capability}, + + where id = ${item.id} + + + - delete from wx_level_config where `tenant_id` = #{tenantId}; + delete from wx_level_config where `tenant_id` = #{tenantId}; + + + + + + + + + + + + + + + + + + + + From f0ee16482d3fc34f440e2a86b901cd6e040747bf Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 17:19:40 +0800 Subject: [PATCH 131/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxActivityJoin.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 8f4a58bd7..b72ebb366 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -46,6 +46,8 @@ public class WxActivityJoin extends BaseEntity { @Excel(name = "微信昵称", width = 10, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") private String nickName; + + @Excel(name = "生日", format = "yyyy-MM-dd", width = 10, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "生日", name = "birthday") private Date birthday; @@ -62,13 +64,13 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") private String answer; - @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "6") + @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") private Integer signIn; - @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "取消报名_2", "活动过期_3"}, width = 10, orderNum = "7") + @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "取消报名_2", "活动过期_3"}, width = 10, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "状态0未确认-报名中1确认-报名成功2取消-报名失败3过期", name = "status") private Integer status; - @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "5") + @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") From dd26958d99119ca71dd26ce8d8d8d59b54a7faf4 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 12 Jun 2019 17:20:48 +0800 Subject: [PATCH 132/289] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=95=86=E6=88=B7=E6=96=B0=E5=A2=9E=E4=B8=BB=E8=B0=88?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E8=BE=85=E8=B0=88=E4=BA=BA,=E5=B9=B6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906121703__ADD_MERCHANT_TALK_USER.sql | 3 +++ .../com/iformall/domain/po/WxMerchant.java | 19 +++++++++++++------ .../resources/mapper/WxMerchantMapper.xml | 7 +++++-- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql b/mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql new file mode 100644 index 000000000..1ac729e0a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906121703__ADD_MERCHANT_TALK_USER.sql @@ -0,0 +1,3 @@ +alter table wx_merchant +ADD COLUMN `talk_user_main` VARCHAR(50) NULL DEFAULT NULL COMMENT '主谈人', +ADD COLUMN `talk_user_aux` VARCHAR(50) NULL DEFAULT NULL COMMENT '辅谈人'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index a9718c198..bb924f50a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -111,8 +111,8 @@ public class WxMerchant extends BaseEntity { @Excel(name="联系方式",width = 20,orderNum = "3") private String linkPhone; - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @Excel(name="创建时间",width = 20,format="yyyy-MM-dd",orderNum = "10") + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; @@ -156,8 +156,8 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status") private Integer isAdmin; + @Excel(name = "待缴提醒", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting") - @Excel(name = "待缴提醒", width = 20, orderNum = "12") private Integer billSetting; @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") @@ -172,12 +172,19 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") private String actionDesc; - @Transient - private WxProfitSharingReceiver wxProfitSharingReceiver; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + + @Excel(name = "主谈人", width = 20, orderNum = "13") + @io.swagger.annotations.ApiModelProperty(value = "主谈人", name = "talkUserMain") + private String talkUserMain; + @Excel(name = "辅谈人", width = 20, orderNum = "14") + @io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") + private String talkUserAux; - @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") - private Integer isDel; + @Transient + private WxProfitSharingReceiver wxProfitSharingReceiver; @Override public String getSortColumns() { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 5466e712c..14d67601d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -27,14 +27,17 @@ - + + + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, - `introduction`,`action_desc`,is_del + `introduction`,`action_desc`,`is_del`, + `talk_user_main`,`talk_user_aux` From 66e0631b3fa9d521eda5d1d393d7da70b8dc3fc7 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 12 Jun 2019 19:06:34 +0800 Subject: [PATCH 133/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E5=BC=80=E7=89=A9=E7=9B=92=E5=AD=90=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwBoxV1Controller.java | 223 ++++++++++++++++++ .../java/com/iformall/domain/po/KwBox.java | 4 +- .../domain/po/{KwMeters.java => KwMeter.java} | 2 +- .../iformall/enums/EnumBoxMeterStatus.java | 34 +++ .../com/iformall/enums/EnumBoxStatus.java | 34 +++ .../com/iformall/mapper/KwMetersMapper.java | 6 +- .../service/kw/KwBoxCmdHistoryService.java | 57 +++++ .../service/kw/KwBoxMeterService.java | 58 +++++ .../com/iformall/service/kw/KwBoxService.java | 68 ++++++ .../service/kw/KwMeterDataService.java | 59 +++++ .../iformall/service/kw/KwMeterService.java | 59 +++++ .../kw/impl/KwBoxCmdHistoryServiceImpl.java | 61 +++++ .../kw/impl/KwBoxMeterServiceImpl.java | 60 +++++ .../service/kw/impl/KwBoxServiceImpl.java | 150 ++++++++++++ .../kw/impl/KwMeterDataServiceImpl.java | 60 +++++ .../service/kw/impl/KwMeterServiceImpl.java | 60 +++++ .../mapper/KwBoxCmdHistoryMapper.xml | 2 +- .../resources/mapper/KwBoxMeterMapper.xml | 2 +- .../mapper/KwMerchantMeterMapper.xml | 2 +- .../resources/mapper/KwMeterDataMapper.xml | 2 +- .../main/resources/mapper/KwMetersMapper.xml | 4 +- 21 files changed, 995 insertions(+), 12 deletions(-) create mode 100644 mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java rename mallinkService/src/main/java/com/iformall/domain/po/{KwMeters.java => KwMeter.java} (98%) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java create mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java new file mode 100644 index 000000000..871b4cd91 --- /dev/null +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -0,0 +1,223 @@ +package com.iformall.controller.device; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwBoxCmdHistory; +import com.iformall.enums.EnumBoxStatus; +import com.iformall.service.kw.KwBoxCmdHistoryService; +import com.iformall.service.kw.KwBoxService; +import io.netty.util.internal.StringUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("kwBox/v1") +@Api(description="开物盒子") +public class KwBoxV1Controller extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private KwBoxService kwBoxService; + + @Autowired + private KwBoxCmdHistoryService kwBoxCmdHistoryService; + + + private void saveCmd(String tenantId, String cmd, String imei, String ccid, Date deviceTime, Map paramMap) + { + KwBoxCmdHistory kwBoxCmdHistory = new KwBoxCmdHistory(); + kwBoxCmdHistory.setCmd(cmd); + kwBoxCmdHistory.setCreateTime(new Date()); + kwBoxCmdHistory.setDeviceTime(deviceTime); + kwBoxCmdHistory.setIccid(ccid); + kwBoxCmdHistory.setImei(imei); + kwBoxCmdHistory.setInfo(JSONObject.toJSON(paramMap).toString()); + kwBoxCmdHistory.setTenantId(tenantId); + kwBoxCmdHistoryService.saveOrUpdate(kwBoxCmdHistory); + + } + + private ResultData cmdRegist(String imei, String ccid, Date deviceTime, Map paramMap) + { + + String fwv = paramMap.get("FWV"); + if (StringUtil.isNullOrEmpty(fwv)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + String hwv = paramMap.get("HWV"); + if (StringUtil.isNullOrEmpty(hwv)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + KwBox kwBox = kwBoxService.findByImei(imei); + + if (kwBox == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + if (!kwBox.getStatus().equals(EnumBoxStatus.INIT)) + return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); + + saveCmd(kwBox.getTenantId(),"regist",imei,ccid,deviceTime,paramMap); + + KwBox record = new KwBox(); + record.setId(kwBox.getId()); + record.setIccid(ccid); + record.setFwVersion(fwv); + record.setHdVersion(hwv); + record.setUpdateTime(new Date()); + record.setRegisterTime(new Date()); + record.setLastOnlineTime(new Date()); + record.setStatus(EnumBoxStatus.REGISTERED.getCode()); + kwBoxService.saveOrUpdate(record); + Map data = new HashMap<>(); + data.put("config",kwBox.getConfig()); + List meters = kwBoxService.findMeters(kwBox); + data.put("meters",meters); + return new ResultData(data); + + } + + private ResultData cmdLogin(String imei, String ccid, Date deviceTime, Map paramMap) + { + KwBox kwBox = kwBoxService.findByImei(imei); + + if (kwBox == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED.getCode())) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + saveCmd(kwBox.getTenantId(),"login",imei,ccid,deviceTime,paramMap); + + KwBox record = new KwBox(); + record.setId(kwBox.getId()); + record.setIccid(ccid); + record.setUpdateTime(new Date()); + record.setLastOnlineTime(new Date()); + kwBoxService.saveOrUpdate(record); + Map data = new HashMap<>(); + data.put("config",kwBox.getConfig()); + return new ResultData(data); + } + + + + private ResultData cmdHb(String imei, String ccid, Date deviceTime, Map paramMap) + { + KwBox kwBox = kwBoxService.findByImei(imei); + if (kwBox == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED)) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + saveCmd(kwBox.getTenantId(),"hb",imei,ccid,deviceTime,paramMap); + + KwBox record = new KwBox(); + record.setId(kwBox.getId()); + record.setLastOnlineTime(new Date()); + + kwBoxService.saveOrUpdate(record); + Map resData = new HashMap<>(); + + + List meters = kwBoxService.findMeters(kwBox); + String metersDataStr = paramMap.get("meters"); + JSONArray ja = JSONObject.parseArray(metersDataStr); + + boolean updateMeters = false; + boolean updateConfig = false; + + if (ja.size() > 0) { + List metersData = ja.toJavaList(HashMap.class); + metersData.stream().forEach(m->{ + String addr = (String)m.get("addr"); + String data = (String)m.get("data"); + kwBoxService.saveMeterData(kwBox, deviceTime, addr, data); + }); + + if (metersData.size() != meters.size()) { + updateMeters = true; + } else { + if (!meters.containsAll(metersData.stream().map(m->m.get("addr")).collect(Collectors.toList()))) + updateMeters = true; + } + + } else { + updateMeters = true; + } + + if (updateMeters) { + if (meters.size() > 0) + resData.put("meters", meters); + } + if (updateConfig) { + resData.put("config", kwBox.getConfig()); + } + return new ResultData(resData); + + } + + + //“TIME”:”19/05/29 08:24:57 +32”, + + + @ApiOperation("广告列表") + @PostMapping("command") + @SystemControllerLog(description = "开物盒子v1") + public Result v1(@RequestBody Map paramMap) { + + String cmd = paramMap.get("CMD"); + if (StringUtil.isNullOrEmpty(cmd)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + String imei = paramMap.get("IMEI"); + if (StringUtil.isNullOrEmpty(imei)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + String ccid = paramMap.get("CCID"); + if (StringUtil.isNullOrEmpty(ccid)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + String time = paramMap.get("TIME"); + if (StringUtil.isNullOrEmpty(time)) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yy/MM/dd,hh:mm:ss±zz"); + Date deviceTime = null; + try { + deviceTime=simpleDateFormat.parse(time); + } catch(Exception e) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + + switch(cmd) + { + case "regist": + return cmdRegist(imei,ccid,deviceTime,paramMap); + case "login": + return cmdLogin(imei,ccid,deviceTime,paramMap); + case "hb": + return cmdHb(imei,ccid,deviceTime,paramMap); + } + + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 51e5385f4..1d3123341 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -45,10 +45,10 @@ public class KwBox extends BaseEntity { private String place; @io.swagger.annotations.ApiModelProperty(value = "固件版本号", name = "fwVersion") - private String fw_version; + private String fwVersion; @io.swagger.annotations.ApiModelProperty(value = "硬件版本号", name = "hdVersion") - private String hd_version; + private String hdVersion; @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "status") private Integer status; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java similarity index 98% rename from mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java rename to mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index bf8cb2fb3..69c64553e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -18,7 +18,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class KwMeters extends BaseEntity { +public class KwMeter extends BaseEntity { @Id protected Long id; @Transient diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java new file mode 100644 index 000000000..1104f2c2c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java @@ -0,0 +1,34 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBoxMeterStatus { + + VALID(0, "有效"), + INVALID(1, "无效"); + public static EnumBoxMeterStatus getEnum(Integer code) { + for (EnumBoxMeterStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumBoxMeterStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java new file mode 100644 index 000000000..de23d59e7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java @@ -0,0 +1,34 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBoxStatus { + + INIT(0, "出厂"), + REGISTERED(1, "注册"); + public static EnumBoxStatus getEnum(Integer code) { + for (EnumBoxStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumBoxStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java index d46988893..d2214ff06 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java @@ -1,13 +1,13 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; -import com.iformall.domain.po.KwMeters; +import com.iformall.domain.po.KwMeter; import java.util.List; -public interface KwMetersMapper extends CommonMapper { +public interface KwMetersMapper extends CommonMapper { - List findList(KwMeters param); + List findList(KwMeter param); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java new file mode 100644 index 000000000..735f1ef46 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxCmdHistoryService.java @@ -0,0 +1,57 @@ +package com.iformall.service.kw; + + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBoxCmdHistory; + +import java.util.List; + +public interface KwBoxCmdHistoryService { + + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(KwBoxCmdHistory record, Integer pageIndex, Integer pageSize); + + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + KwBoxCmdHistory getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(KwBoxCmdHistory record); + + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(KwBoxCmdHistory record); + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java new file mode 100644 index 000000000..aa12d0ff1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java @@ -0,0 +1,58 @@ +package com.iformall.service.kw; + + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBoxMeter; + +import java.util.List; + +public interface KwBoxMeterService { + + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(KwBoxMeter record, Integer pageIndex, Integer pageSize); + + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + KwBoxMeter getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(KwBoxMeter record); + + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(KwBoxMeter record); + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java new file mode 100644 index 000000000..edef174b8 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java @@ -0,0 +1,68 @@ +package com.iformall.service.kw; + + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwMeter; +import com.iformall.domain.po.KwMeterData; + + +import java.util.Date; +import java.util.List; + +public interface KwBoxService { + + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(KwBox record, Integer pageIndex, Integer pageSize); + + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + KwBox getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(KwBox record); + + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(KwBox record); + + + List findMeters(KwBox record); + KwMeter findMeter(KwBox record, String addr); + + KwBox findByImei(String imei); + + KwMeterData saveMeterData(KwBox record, Date deviceTime, String addr, String data); +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java new file mode 100644 index 000000000..73818a4f6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java @@ -0,0 +1,59 @@ +package com.iformall.service.kw; + + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwMeter; +import com.iformall.domain.po.KwMeterData; + +import java.util.List; + +public interface KwMeterDataService { + + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(KwMeterData record, Integer pageIndex, Integer pageSize); + + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + KwMeterData getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(KwMeterData record); + + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(KwMeterData record); + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java new file mode 100644 index 000000000..737225750 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java @@ -0,0 +1,59 @@ +package com.iformall.service.kw; + + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwMeter; + +import java.util.List; + +public interface KwMeterService { + + + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(KwMeter record, Integer pageIndex, Integer pageSize); + + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + KwMeter getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + ResultData saveOrUpdate(KwMeter record); + + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(KwMeter record); + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java new file mode 100644 index 000000000..9f8e763b3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxCmdHistoryServiceImpl.java @@ -0,0 +1,61 @@ +package com.iformall.service.kw.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBoxCmdHistory; +import com.iformall.domain.po.KwMeter; +import com.iformall.mapper.KwBoxCmdHistoryMapper; +import com.iformall.service.kw.KwBoxCmdHistoryService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class KwBoxCmdHistoryServiceImpl implements KwBoxCmdHistoryService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + KwBoxCmdHistoryMapper kwBoxCmdHistoryMapper; + + @Override + public PageInfo listAsPage(KwBoxCmdHistory record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwBoxCmdHistoryMapper.findList(record)); + } + + @Override + public KwBoxCmdHistory getById(Long id) { + return kwBoxCmdHistoryMapper.selectByPrimaryKey(id); + } + + + @Override + public ResultData saveOrUpdate(KwBoxCmdHistory record) { + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + kwBoxCmdHistoryMapper.insertSelective(record); + } else { + kwBoxCmdHistoryMapper.updateByPrimaryKeySelective(record); + } + return new ResultData(); + } + + + @Override + public void deleteById(Long id) { + kwBoxCmdHistoryMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(KwBoxCmdHistory record) { + return kwBoxCmdHistoryMapper.findList(record); + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java new file mode 100644 index 000000000..9ada88c1c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java @@ -0,0 +1,60 @@ +package com.iformall.service.kw.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwBoxMeter; +import com.iformall.mapper.KwBoxMeterMapper; +import com.iformall.service.kw.KwBoxMeterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class KwBoxMeterServiceImpl implements KwBoxMeterService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + KwBoxMeterMapper kwBoxMeterMapper; + + @Override + public PageInfo listAsPage(KwBoxMeter record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwBoxMeterMapper.findList(record)); + } + + @Override + public KwBoxMeter getById(Long id) { + return kwBoxMeterMapper.selectByPrimaryKey(id); + } + + + @Override + public ResultData saveOrUpdate(KwBoxMeter record) { + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + kwBoxMeterMapper.insertSelective(record); + } else { + kwBoxMeterMapper.updateByPrimaryKeySelective(record); + } + return new ResultData(); + } + + + @Override + public void deleteById(Long id) { + kwBoxMeterMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(KwBoxMeter record) { + return kwBoxMeterMapper.findList(record); + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java new file mode 100644 index 000000000..b57c707aa --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -0,0 +1,150 @@ +package com.iformall.service.kw.impl; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; + +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwBoxMeter; +import com.iformall.domain.po.KwMeter; +import com.iformall.domain.po.KwMeterData; +import com.iformall.enums.EnumBoxMeterStatus; +import com.iformall.mapper.KwBoxMapper; +import com.iformall.service.kw.KwBoxMeterService; +import com.iformall.service.kw.KwBoxService; +import com.iformall.service.kw.KwMeterDataService; +import com.iformall.service.kw.KwMeterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + + +@Service +public class KwBoxServiceImpl implements KwBoxService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + KwBoxMapper kwBoxMapper; + + @Autowired + KwMeterDataService kwMeterDataService; + + @Autowired + KwBoxMeterService kwBoxMeterService; + + @Autowired + KwMeterService kwMeterService; + + @Override + public PageInfo listAsPage(KwBox record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwBoxMapper.findList(record)); + } + + @Override + public KwBox getById(Long id) { + return kwBoxMapper.selectByPrimaryKey(id); + } + + + @Override + public ResultData saveOrUpdate(KwBox record) { + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + kwBoxMapper.insertSelective(record); + } else { + kwBoxMapper.updateByPrimaryKeySelective(record); + } + return new ResultData(); + } + + + @Override + public void deleteById(Long id) { + kwBoxMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(KwBox record) { + return kwBoxMapper.findList(record); + } + + @Override + public KwBox findByImei(String imei) { + KwBox kwBox = new KwBox(); + kwBox.setImei(imei); + List kwBoxes = findList(kwBox); + if (kwBoxes.size() > 0) + return kwBoxes.get(0); + return null; + } + + @Override + public KwMeterData saveMeterData(KwBox record, Date deviceTime, String addr, String data){ + + KwMeter kwMeter = findMeter(record, addr); + + if (kwMeter==null) return null; + + KwMeterData kwMeterData = new KwMeterData(); + kwMeterData.setTenantId(record.getTenantId()); + kwMeterData.setUpdateTime(new Date()); + kwMeterData.setAddress(addr); + kwMeterData.setBoxId(record.getId()); + kwMeterData.setCreateTime(new Date()); + kwMeterData.setDeviceTime(deviceTime); + kwMeterData.setMeterId(kwMeter.getId()); + kwMeterData.setResult(data); + + kwMeterDataService.saveOrUpdate(kwMeterData); + return kwMeterData; + } + + @Override + public List findMeters(KwBox record) { + + KwBoxMeter kwBoxMeter = new KwBoxMeter(); + kwBoxMeter.setBoxId(record.getId()); + kwBoxMeter.setStatus(EnumBoxMeterStatus.VALID.getCode()); + + List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); + + KwMeter kwMeter = new KwMeter(); + kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); + + List kwMeters = kwMeterService.findList(kwMeter); + + return kwMeters.stream().map(KwMeter::getAddress).collect(Collectors.toList()); + } + + @Override + public KwMeter findMeter(KwBox record, String addr) { + + KwBoxMeter kwBoxMeter = new KwBoxMeter(); + kwBoxMeter.setBoxId(record.getId()); + kwBoxMeter.setStatus(EnumBoxMeterStatus.VALID.getCode()); + + List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); + + KwMeter kwMeter = new KwMeter(); + kwMeter.setAddress(addr); + kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); + + List kwMeters = kwMeterService.findList(kwMeter); + + + if (kwMeters.size() > 0) + return kwMeters.get(0); + else + return null; + + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java new file mode 100644 index 000000000..74cb3eedc --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -0,0 +1,60 @@ +package com.iformall.service.kw.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwMeterData; +import com.iformall.mapper.KwMeterDataMapper; +import com.iformall.service.kw.KwMeterDataService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class KwMeterDataServiceImpl implements KwMeterDataService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + KwMeterDataMapper kwMeterDataMapper; + + @Override + public PageInfo listAsPage(KwMeterData record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterDataMapper.findList(record)); + } + + @Override + public KwMeterData getById(Long id) { + return kwMeterDataMapper.selectByPrimaryKey(id); + } + + + @Override + public ResultData saveOrUpdate(KwMeterData record) { + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + kwMeterDataMapper.insertSelective(record); + } else { + kwMeterDataMapper.updateByPrimaryKeySelective(record); + } + return new ResultData(); + } + + + @Override + public void deleteById(Long id) { + kwMeterDataMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(KwMeterData record) { + return kwMeterDataMapper.findList(record); + } + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java new file mode 100644 index 000000000..3b48bf34c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -0,0 +1,60 @@ +package com.iformall.service.kw.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.KwMeter; +import com.iformall.mapper.KwMetersMapper; +import com.iformall.service.kw.KwMeterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class KwMeterServiceImpl implements KwMeterService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + KwMetersMapper kwMetersMapper; + + @Override + public PageInfo listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMetersMapper.findList(record)); + } + + @Override + public KwMeter getById(Long id) { + return kwMetersMapper.selectByPrimaryKey(id); + } + + + @Override + public ResultData saveOrUpdate(KwMeter record) { + if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + kwMetersMapper.insertSelective(record); + } else { + kwMetersMapper.updateByPrimaryKeySelective(record); + } + return new ResultData(); + } + + + @Override + public void deleteById(Long id) { + kwMetersMapper.deleteByPrimaryKey(id); + } + + @Override + public List findList(KwMeter record) { + return kwMetersMapper.findList(record); + } + + +} diff --git a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml index 08f55811c..32ab96016 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml @@ -37,7 +37,7 @@ order by ${sortColumns} - select from kw_box_cmd_history diff --git a/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml index 27412f3c0..3dc46c552 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml @@ -39,7 +39,7 @@ order by ${sortColumns} - select from kw_box_meter diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 7f929b68f..2faf4ee88 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -39,7 +39,7 @@ order by ${sortColumns} - select from kw_box_meter diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index fff673c0c..4939304a2 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -37,7 +37,7 @@ order by ${sortColumns} - select from kw_box_cmd_history diff --git a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml b/mallinkService/src/main/resources/mapper/KwMetersMapper.xml index e6bcf67e3..125016fba 100644 --- a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMetersMapper.xml @@ -1,7 +1,7 @@ - + @@ -60,7 +60,7 @@ order by ${sortColumns} - select from kw_meters From 0cdcab868a16c1e0af73d8a67648bc1b37ee4f5a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 19:22:26 +0800 Subject: [PATCH 134/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9F=A5=E7=9C=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 4 +-- .../contract/WxRentContractController.java | 3 +- .../WxRentPropertyContractController.java | 10 ++++++ .../service/WxPropertyContractService.java | 2 +- .../service/WxRentContractService.java | 4 ++- .../impl/WxPropertyContractServiceImpl.java | 6 ++-- .../impl/WxRentContractServiceImpl.java | 34 +++++++++++++++---- .../resources/mapper/WxRentContractMapper.xml | 4 +-- 8 files changed, 50 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 79e1e2368..57562e913 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.Map; /** @@ -112,7 +111,8 @@ public class WxPropertyContractController extends BaseController { WxBillProperty wxBillProperty = new WxBillProperty(); wxBillProperty.setTenantId(super.getTenantId()); wxBillPropertyService.updateBillStatus(wxBillProperty); - return wxPropertyContractService.getById(id); + Map data = wxPropertyContractService.getById(id); + return new ResultData(data); } @RequestMapping("/download") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index ea66724f1..cebb7d41e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -180,7 +180,8 @@ public class WxRentContractController extends BaseController { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setTenantId(getTenantId()); wxBillRentService.updateBillStatus(wxBillRent); - return wxRentContractService.getById(id); + Map data = wxRentContractService.getById(id); + return new ResultData(data); } @RequestMapping("/download") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 24e40337f..1ee2fe6fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -8,6 +8,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.service.WxRentContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +43,15 @@ public class WxRentPropertyContractController extends BaseController { return new ResultData(page); } + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "租赁物业合同-根据id查询接口") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById"); + return wxRentContractService.getContractInfo(id); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 797c654e5..2dcb846d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -32,7 +32,7 @@ public interface WxPropertyContractService { * @param id * @return */ - ResultData getById(Long id); + Map getById(Long id); /** * 保存或更新实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 31403379f..d40a744ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -35,7 +35,7 @@ public interface WxRentContractService { * @param id * @return */ - ResultData getById(Long id); + Map getById(Long id); /** * 保存或更新实体 @@ -90,4 +90,6 @@ public interface WxRentContractService { PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize); + ResultData getContractInfo(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 59a303c6e..355cf8353 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -83,12 +83,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } @Override - public ResultData getById(Long id) { + public Map getById(Long id) { Map result = new HashMap<>(); WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(id); if (wxPropertyContract == null) { - return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); + throw new MallinkException(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } //init dateDiff @@ -195,7 +195,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService List resultList = wxBillPropertyMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); - return new ResultData(Result.SUCCESS, "查询成功", result); + return result; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 478dca706..094abb07e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -14,10 +14,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; -import com.iformall.service.WxFlowRecordService; -import com.iformall.service.WxFlowService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxRentContractService; +import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.DownFileUtil; import com.iformall.utils.PriceUtil; @@ -105,6 +102,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Autowired WxFlowRecordMapper wxFlowRecordMapper; + @Autowired + WxPropertyContractService wxPropertyContractService; + @Override public Map listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { Object rentContractStatusInfo = getRentContractStatusInfo(record); @@ -118,11 +118,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public ResultData getById(Long id) { + public Map getById(Long id) { Map result = new HashMap<>(); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); if (wxRentContract == null) { - return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + throw new MallinkException(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); } //init dateDiff @@ -242,7 +242,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { List resultList = wxBillRentMapper.findList(wxBillRent); result.put("previewBillRentList",resultList); - return new ResultData(Result.SUCCESS, "查询成功", result); + return result; } @Transactional(rollbackFor = {Exception.class}) @@ -1841,6 +1841,26 @@ public class WxRentContractServiceImpl implements WxRentContractService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); } + @Override + public ResultData getContractInfo(Long id) { + Map data = new HashMap<>(); + Map rent = getById(id); + data.put("rent", rent); + WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); + wxPropertyContractQuery.setRentContractId(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.select(wxPropertyContractQuery).parallelStream() + .filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || + p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || + p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) + .findFirst().orElseGet(null); + data.put("property", wxPropertyContract); + if (wxPropertyContract != null) { + Map property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); + data.put("property", property); + } + return new ResultData(data); + } + public static double getMonthNeedPay(Double price,Date start,Date end){ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 8216ffa60..ba1b8bff5 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -317,8 +317,8 @@ From 8ae6808ee1b8c1f25ed0939ad1682f04a23e5d8d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 12 Jun 2019 19:38:05 +0800 Subject: [PATCH 136/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 4b20a062f..9c5210727 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -76,13 +76,13 @@ from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id where aj.user_id=#{user_id} - and `tenant_id` = #{tenantId} + and aj.`tenant_id` = #{tenantId} - and `status` in (${statusStr}) + and aj.`status` in (${statusStr}) - and `status`= #{status} + and aj.`status`= #{status} order by ${sortColumns} From 247da53053ea4174993885401b0d1da5e6216827 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 12 Jun 2019 19:54:09 +0800 Subject: [PATCH 137/289] =?UTF-8?q?[=E5=9C=BA=E6=99=AF][=E6=96=B0=E5=A2=9E?= =?UTF-8?q?]:=E8=B4=AD=E4=B9=B0=E5=8F=91=E5=88=B8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6=E6=97=B6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index ae385cb7c..258aca5e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -51,6 +51,29 @@ public class WxCouponController extends BaseController { wxCoupon.setTenantId(getTenantId()); return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } + @ApiOperation("分页列表接口") + @GetMapping("listWithTypePress") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "券投放-列表") + public ResultData listWithTypePress(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxCouponController::list"); + if (wxCoupon == null) wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); + Integer[] typeArray = { + EnumCouponType.COUPON_MANJIAN.getCode(), + EnumCouponType.COUPON_DAIJIN.getCode(), + EnumCouponType.COUPON_TUANGOU.getCode(), + EnumCouponType.COUPON_LIPIN.getCode(), + EnumCouponType.COUPON_TINGCHE.getCode(), + EnumCouponType.COUPON_MULTIMCH.getCode(), + EnumCouponType.COUPON_PRESS.getCode()}; + + wxCoupon.setTypes(Arrays.asList(typeArray)); + return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 + } + @ApiOperation("新增接口") @PostMapping("add") From 0248da88320d1799127e60bcbe3b020b16fe64ed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 11:01:30 +0800 Subject: [PATCH 138/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=A1=AE=E8=AE=A4=E5=90=8E=E5=8F=AA?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=B8=80=E6=AC=A1=E7=9F=AD=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906131029__ALTER_ACTIVITY.sql | 2 ++ .../iformall/schedule/ActivitySchedule.java | 1 + .../com/iformall/domain/po/WxActivity.java | 3 ++ .../iformall/domain/po/WxActivityJoin.java | 6 ++++ .../java/com/iformall/enums/EnumSendMsg.java | 35 +++++++++++++++++++ .../iformall/mapper/WxActivityJoinMapper.java | 3 ++ .../impl/WxActivityJoinServiceImpl.java | 11 ++++-- .../resources/mapper/WxActivityJoinMapper.xml | 13 ++++++- .../resources/mapper/WxActivityMapper.xml | 12 +++++-- 9 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql b/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql new file mode 100644 index 000000000..b5aec7703 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906131029__ALTER_ACTIVITY.sql @@ -0,0 +1,2 @@ +alter table wx_activity ADD COLUMN `send_msg` smallint(2) DEFAULT 0 COMMENT '是否发送短信1是0否'; +alter table wx_activity_join ADD COLUMN `send_msg` smallint(2) DEFAULT 0 COMMENT '是否发送短信1是0否'; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 425abb7a0..f25ba26ff 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -57,6 +57,7 @@ public class ActivitySchedule { wxActivityJoin.setTenantId(activity.getTenantId()); wxActivityJoin.setActivityId(activity.getId()); wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + wxActivityJoin.setSendMsg(EnumSendMsg.YES.getCode()); List list = wxActivityJoinMapper.findList(wxActivityJoin); for (WxActivityJoin activityJoin : list) { send(activity, activityJoin); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 44476af33..66155b3cf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -81,6 +81,9 @@ public class WxActivity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "图片说明", name = "imgDetail") private String imgDetail; + @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") + private Integer sendMsg; + @Transient @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime") private Date starttime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 41f7d14f7..83a42f24e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -11,6 +11,9 @@ import javax.persistence.Transient; import java.util.Date; import java.util.List; +/** + * @author gongbiao + */ @Table(name = "wx_activity_join") @Data @ToString(callSuper = true) @@ -76,6 +79,9 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "是否发送短信1是0否", name = "sendMsg") + private Integer sendMsg; + @io.swagger.annotations.ApiModelProperty(value = "图片", name = "imgUrl") private String img_url; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java b/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java new file mode 100644 index 000000000..b8f7e7146 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSendMsg.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumSendMsg { + + YES(1, "已发送"), + NO(0, "未发送"); + + public static EnumSendMsg getEnum(Integer code) { + for (EnumSendMsg value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumSendMsg(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index 6fa357902..28a74da2a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxActivityJoin; import java.util.List; +import java.util.Map; /** * @author gongbiao @@ -14,4 +15,6 @@ public interface WxActivityJoinMapper extends CommonMapper void cfindList(WxActivityJoin wxActivityJoin); + void updateSendMsg(Map param); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 25f823853..a5117a9f9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -108,11 +108,18 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sendMsg(WxActivityJoin wxActivityJoin) { - WxActivity campaign = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + activity.setSendMsg(EnumSendMsg.YES.getCode()); + activity.setUpdateTime(new Date()); + wxActivityMapper.updateByPrimaryKeySelective(activity); List joinList = wxActivityJoinMapper.select(wxActivityJoin); for (WxActivityJoin join : joinList) { - sendMessage(join, campaign); + sendMessage(join, activity); } + Map param = new HashMap<>(2); + param.put("sendMsg", EnumSendMsg.YES.getCode()); + param.put("joinList", joinList); + wxActivityJoinMapper.updateSendMsg(param); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 9c5210727..0dac58226 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -18,12 +18,13 @@ + `id`,`tenant_id`,`user_id`,`activity_id`,`name`,`nick_name`,`birthday`,`sex`,`phone`, - `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url` + `address`,`answer`,`sign_in`,`status`,`create_time`,`update_time`,`img_url`,`send_msg` @@ -54,6 +55,9 @@ and `activity_id` = #{activityId} + + and `send_msg` = #{sendMsg} + and id in @@ -86,5 +90,12 @@ order by ${sortColumns} + + + update wx_activity_join set send_msg = #{send_msg} where id in + + #{join.id} + + diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml index 8df7273a2..c1da23160 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml @@ -24,12 +24,14 @@ + `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`detail`,`html`,`person_limit`,`activity_start_time`,`activity_end_time`, - `use_credit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`,`img_detail` + `use_credit`,`credit`,`type`,`status`,`start_time`,`end_time`,`question`,`is_expired`,`create_time`,`update_time`,`use_img`, + `img_detail`,`send_msg` @@ -82,6 +84,10 @@ and `create_time` between #{starttime} and #{endtime} + + and `send_msg` = #{sendMsg} + + and id in @@ -101,7 +107,9 @@ From d9012d71ee010baacce32814ed27efb23470837a Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 13 Jun 2019 11:41:49 +0800 Subject: [PATCH 139/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 15 ++- .../com/iformall/domain/po/WxFlowModel.java | 8 +- .../java/com/iformall/enums/EnumFlowKey.java | 9 +- .../java/com/iformall/enums/EnumTaskType.java | 2 +- .../iformall/mapper/WxFlowModelMapper.java | 2 + .../com/iformall/service/WxFlowService.java | 9 +- .../service/impl/WxFlowServiceImpl.java | 105 ++++++++++++++---- .../impl/WxPropertyContractServiceImpl.java | 10 -- .../impl/WxRentContractServiceImpl.java | 30 +---- .../resources/mapper/WxFlowModelMapper.xml | 10 ++ 10 files changed, 135 insertions(+), 65 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 19cdc6051..4accaebe3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -69,7 +69,7 @@ public class WxFlowAbleController extends BaseController { @SystemControllerLog(description = "工作流-用户代办列表") public ResultData list(String flowType,Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] FlowAbleController::list"); - return wxFlowService.list(flowType,pageNum,pageSize,getUserId()); + return wxFlowService.list(flowType,pageNum,pageSize,getUserId(),getTenantId()); } /** @@ -247,6 +247,19 @@ public class WxFlowAbleController extends BaseController { return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); } + /** + * 根据业务查询模板 + */ + @ApiOperation("根据业务查询模板") + @GetMapping(value = "/getModelBybusiness") + @SystemControllerLog(description = "工作流-模板列表") + public ResultData getModelBybusiness(@ModelAttribute WxFlowModel wxFlowModel) { + logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness"); + wxFlowModel.setTenantId(getTenantId()); + return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel)); + } + + /** * 配置列表 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java index 7a3da5901..b127025ed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowModel.java @@ -1,11 +1,9 @@ package com.iformall.domain.po; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.vo.UserTaskVo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -42,6 +40,12 @@ public class WxFlowModel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="流程id",name="flowId") + private String flowId; + @io.swagger.annotations.ApiModelProperty(value="流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架",name="flowId") + @Transient + private Integer flowType; + @Transient private List lists; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index caf1bb46e..3f6cc3673 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -7,7 +7,14 @@ package com.iformall.enums; public enum EnumFlowKey{ CONTRACT(1, "contract_flow"), //合同审批 BILL(2, "end_bill_flow"),//账单审批 - END_CONTRACT(3, "end_contract_flow")//终止合同审批 + END_CONTRACT(3, "end_contract_flow"),//终止合同审批 + + NEW_RENT_CONTRACT(4, "商铺合同签约"), + NEW_SHOP_CONTRACT(5, "多径点位合同签约"), + NEW_RENT_END_CONTRACT(6, "商铺合同终止"), + NEW_SHOP_END_CONTRACT(7, "多经点位合同终止"), + NEW_BILL_CHANGE(8, "账单应收金额变更"), + NEW_COUPON_UPLINE(9, "有价券上架"), ; public static EnumFlowKey getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java index 4287eeb06..a04fa5f12 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java @@ -1,7 +1,7 @@ package com.iformall.enums; /** - * Created by Stormeye on 2018/08/09. + * Created by luozukai */ public enum EnumTaskType { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java index f55af0f39..8dd034ed3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowModelMapper.java @@ -13,4 +13,6 @@ public interface WxFlowModelMapper extends CommonMapper { List findList(WxFlowModel wxFlowModel); WxFlowModel selectById(Long id); + + List getModelBybusiness(WxFlowModel wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 25cfc3fec..4a992491b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -15,6 +15,7 @@ import java.util.Map; * 流程审批服务 */ public interface WxFlowService { + String getFlowKeyByType(int flowType,String tenantId); /** * 更新业务数据状态 @@ -39,7 +40,7 @@ public interface WxFlowService { * @param pageSize * @return */ - ResultData list(String flowType,Integer pageNum, Integer pageSize,Long userId); + ResultData list(String flowType,Integer pageNum, Integer pageSize,Long userId,String tenantId); /** * 审批历史 @@ -126,4 +127,10 @@ public interface WxFlowService { * @return */ ResultData updateConfig(WxFlowConfig wxFlowConfig); + + /** + * 根据业务查询模板 + * @return + */ + List getModelBybusiness(WxFlowModel wxFlowModel); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0a3656223..0678c0b2c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -27,6 +27,8 @@ import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.Process; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; +import org.flowable.engine.repository.Deployment; +import org.flowable.engine.repository.DeploymentBuilder; import org.flowable.engine.runtime.Execution; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.identitylink.api.IdentityLink; @@ -105,8 +107,15 @@ public class WxFlowServiceImpl implements WxFlowService { * @param flowType * @return */ - public static String getFlowKeyByType(int flowType){ - return EnumFlowKey.getEnum(flowType).getMessage(); + public String getFlowKeyByType(int flowType,String tenantId){ + WxFlowConfig query = new WxFlowConfig(); + query.setTenantId(tenantId); + query.setType(flowType); + List configList = wxFlowConfigMapper.findList(query); + if(CollectionUtils.isNotEmpty(configList)){ + return configList.get(0).getWxFlowModel().getFlowId(); + } + return null; } /** @@ -360,6 +369,11 @@ public class WxFlowServiceImpl implements WxFlowService { List> variables = (List)params.get("variables"); Boolean supplement = (Boolean)params.get("supplement"); + String flowKey = getFlowKeyByType(flowType,tenantId); + if(StringUtils.isBlank(flowKey)){ + return new ResultData(ResultData.ERROR, "您尚未设置审批模板,请先设置。"); + } + // 设置节点处理人 HashMap map = new HashMap<>(); for (Map taskAssigneeMap : taskAssignee) { @@ -377,7 +391,7 @@ public class WxFlowServiceImpl implements WxFlowService { map.put("variables",variables); map.put("supplement",supplement); - ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getFlowKeyByType(flowType), map); + ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(flowKey, map); logger.debug("流程启动,流程id:{}",processInstance.getId()); params.put("flowType",flowType); @@ -512,13 +526,13 @@ public class WxFlowServiceImpl implements WxFlowService { } @Override - public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId) { + public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId,String tenantId) { TaskQuery taskQuery = taskService.createTaskQuery(); //流程过滤条件 if(StringUtils.isNotBlank(flowType)) { List definitionKeyList = new ArrayList<>(); for (String ft : flowType.split(",")) { - definitionKeyList.add(getFlowKeyByType(Integer.parseInt(ft))); + definitionKeyList.add(getFlowKeyByType(Integer.parseInt(ft),tenantId)); } if(CollectionUtils.isNotEmpty(definitionKeyList)){ taskQuery.processDefinitionKeyIn(definitionKeyList); @@ -1143,34 +1157,65 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData createModel(WxFlowModel wxFlowModel) { Process process = new Process(); - BpmnModel bpmnModel = new BpmnModel(); - + process.setId(getRandomReqNo()); List flowList = createFlow(wxFlowModel.getLists().size()); - for (int i = 0; i < wxFlowModel.getLists().size(); i++){ - if(i==0){ + for (int i = 0; i < wxFlowModel.getLists().size(); i++) { + UserTaskVo taskVo = wxFlowModel.getLists().get(i); + if (i == 0) { StartEvent start = new StartEvent(); start.setId("start"); start.setName("开始节点"); start.setOutgoingFlows(Arrays.asList(flowList.get(0))); process.addFlowElement(start); process.addFlowElement(flowList.get(0)); - }else if(i==wxFlowModel.getLists().size()-1){ - EndEvent endEvent = new EndEvent(); - endEvent.setId("end"); - endEvent.setName("结束节点"); - endEvent.setIncomingFlows(Arrays.asList(flowList.get(i+1))); } UserTask userTask = new UserTask(); - userTask.setName("节点"+i); - userTask.setId("userTask"+i); + userTask.setName("节点" + (i + 1)); + userTask.setId("userTask" + (i + 1)); + List userIdList = new ArrayList<>(); + String collection = ""; + for (int j = 0; j < taskVo.getUserList().size(); j++) { + FlowUserVo userVo = taskVo.getUserList().get(j); + userIdList.add(userVo.getId() + ""); + if(j==taskVo.getUserList().size()-1){ + collection += userVo.getId(); + }else{ + collection += userVo.getId()+","; + } + } + + if (EnumTaskType.NORMAL.getCode().equals(taskVo.getType()) || EnumTaskType.OR.getCode().equals(taskVo.getType())) { + userTask.setCandidateUsers(userIdList); + } else if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { + MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); + mi.setLoopCardinality(userIdList.size()+""); + mi.setCollectionString(collection); + userTask.setLoopCharacteristics(mi); + } + userTask.setIncomingFlows(Arrays.asList(flowList.get(i))); - userTask.setOutgoingFlows(Arrays.asList(flowList.get(i+1))); + userTask.setOutgoingFlows(Arrays.asList(flowList.get(i + 1))); process.addFlowElement(userTask); - process.addFlowElement(flowList.get(i+1)); + process.addFlowElement(flowList.get(i + 1)); + + if (i == wxFlowModel.getLists().size() - 1) { + EndEvent endEvent = new EndEvent(); + endEvent.setId("end"); + endEvent.setName("结束节点"); + endEvent.setIncomingFlows(Arrays.asList(flowList.get(i + 1))); + process.addFlowElement(endEvent); + } } + BpmnModel bpmnModel = new BpmnModel(); + bpmnModel.addProcess(process); + DeploymentBuilder deploymentBuilder = repositoryService.createDeployment().addBpmnModel(process.getId()+".bpmn20.xml", bpmnModel); + //部署 + Deployment deploy = deploymentBuilder.deploy(); + + wxFlowModel.setFlowId(process.getId()); wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); if(wxFlowModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); @@ -1191,7 +1236,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(i==0){ sequenceFlow.setName("开始"); sequenceFlow.setSourceRef("start"); - sequenceFlow.setTargetRef("userTask"+i); + sequenceFlow.setTargetRef("userTask"+(i+1)); }else if(i == size){ sequenceFlow.setName("结束"); sequenceFlow.setSourceRef("userTask"+i); @@ -1199,13 +1244,28 @@ public class WxFlowServiceImpl implements WxFlowService { }else{ sequenceFlow.setName("sf"+i); sequenceFlow.setSourceRef("userTask"+i); - sequenceFlow.setTargetRef("userTask"+i); + sequenceFlow.setTargetRef("userTask"+(i+1)); } result.add(sequenceFlow); } return result; } + /** + * 获取随机的流水号(10位) + * @return + */ + public static String getRandomReqNo() { + int length=10; + String base = "abcdefghijklmnopqrstuvwxyz"; + Random random = new Random(); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < length; i++) { + int number = random.nextInt(base.length()); + sb.append(base.charAt(number)); + } + return sb.toString(); + } @Override public PageInfo modelList(WxFlowModel wxFlowModel,Integer pageIndex, Integer pageSize) { @@ -1241,4 +1301,9 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowConfigMapper.updateByPrimaryKeySelective(wxFlowConfig); return new ResultData(); } + + @Override + public List getModelBybusiness(WxFlowModel wxFlowModel) { + return wxFlowModelMapper.getModelBybusiness(wxFlowModel); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 355cf8353..907a3dd2b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -528,7 +528,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService index++; if(index >= yearList.size()-1){ - //endDate = wxRentContract.getRentalEndDate(); endDate = null; }else{ endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 @@ -673,16 +672,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Long price = propertyContract.getPrice(); //按月计租 -// if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) -// ||propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview); -// } else { -// //如果按日 -// List yearList = new ArrayList<>(); -// yearList.add(rentalStartDate); -// Map resultMap = buildRent(receivePeriod,new long[]{price}, yearList, Calendar.DAY_OF_MONTH, propertyContract, userId, wxMerchant, 0, isPreview, null); -// result = (List)resultMap.get("billList"); -// } } for (int i = 0; i < result.size(); i++) { result.get(i).setPeriod(i+1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 094abb07e..3075cd8aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -696,7 +696,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("合同id:{},开始停止...", id); //结束审批流 by luozukai - List tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) + List tasks = taskService.createTaskQuery().processDefinitionKey(wxFlowService.getFlowKeyByType(EnumFlowKey.CONTRACT.getCode().intValue(),record.getTenantId())) .processVariableValueEquals("businessId", id+"").list(); if (!CollectionUtils.isEmpty(tasks)) { for (Task task : tasks) { @@ -906,9 +906,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { } List billTimeVoList = initBillTimeList(wxRentContract.getRentalStartDate(),wxRentContract.getRentalEndDate(),wxRentContract.getAdjustPeriod(),dayType,receivePeriod); -// for (BillTimeVo vo:billTimeVoList) { -// System.out.println(sd.format(vo.getStartDate()) + " "+sd.format(vo.getEndDate()) ); -// } int index = 0; for (int i = 0; i < billTimeVoList.size(); i++) { @@ -920,7 +917,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { index++; if(index >= yearList.size()-1){ - //endDate = wxRentContract.getRentalEndDate(); endDate = null; }else{ endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 @@ -1868,9 +1864,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { Double total = new Double(0); int[] diff; - if(sd.format(start).equals("2019-07-01")){ - System.out.println(); - } //同一天 if(sd.format(start).equals(sd.format(end))){ int dayCount = DateUtils.getMonthDayCount(start); @@ -1955,15 +1948,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { price = dayPrice; } - System.out.println("-------monthStartDate:"+sd.format(monthStartDate)); - System.out.println("-------monthStartDate:"+sd.format(end)); - //最后一个月 if(sdM.format(monthStartDate).equals(sdM.format(end))){ - System.out.println("-----------"); - System.out.println(sd.format(monthStartDate)); - System.out.println(sd.format(end)); - diff = DateUtils.getDiff(monthStartDate,end); total += price * (diff[1] +1); break; @@ -1976,17 +1962,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { return total; } - public static void main(String[] args) throws Exception{ -// long tprice = 100; - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - Date start = sd.parse("2020-05-02"); -// Date end = sd.parse("2020-07-28"); - -// System.out.println("===="+new WxRentContractServiceImpl().getNeedPay(tprice,0,start,end));; - SimpleDateFormat sdD = new SimpleDateFormat("d"); - System.out.println(sdD.format(start)); - } - public static List initBillTimeList(Date start,Date end,Integer adjustPeriod,Integer dayType,int receivePeriod){ List list = new ArrayList<>(); @@ -2006,14 +1981,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { timeVo.setReceiveDate(instance.getTime()); //结束时间 - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); -// System.out.println(sd.format(start)); instance.clear(); instance.setTime(start); instance.add(dayType, receivePeriod); instance.add(Calendar.DATE, -1); timeVo.setEndDate(instance.getTime()); -// System.out.println(sd.format(instance.getTime())); //自然月 if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ diff --git a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml index b1f8dbdc5..6a1f89daa 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowModelMapper.xml @@ -10,6 +10,7 @@ + @@ -35,6 +36,15 @@ select * from wx_flow_model where id=#{id} + + From cfde7d5300295f822065e425bdeee1e58fcd523b Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 13 Jun 2019 11:58:47 +0800 Subject: [PATCH 140/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E5=BC=80=E7=89=A9=E7=9B=92=E5=AD=90=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/config/ShiroConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index c7d508c35..8fe04734d 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -102,6 +102,8 @@ public class ShiroConfig { // 硬件访问 filterChainDefinitionMap.put("/wxDeviceScreenAd/**", "anon"); + filterChainDefinitionMap.put("/kwBox/**", "anon"); + // callback filterChainDefinitionMap.put("/wxPay/notify/**", "anon"); // 支付回调 filterChainDefinitionMap.put("/wxPayBill/notify/**", "anon"); From 53d6fd9bc7a9912a53ffaa30a32def32eb58dc23 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 13 Jun 2019 12:20:42 +0800 Subject: [PATCH 141/289] =?UTF-8?q?[=E8=A7=92=E8=89=B2][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/MallUserRoleService.java | 7 ------- .../com/iformall/service/impl/MallUserRoleServiceImpl.java | 6 ------ 2 files changed, 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java index f3dd17562..decae7a99 100644 --- a/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java +++ b/mallinkService/src/main/java/com/iformall/service/MallUserRoleService.java @@ -56,13 +56,6 @@ public interface MallUserRoleService { */ void deleteById(Long id); - /** - * 批量增加用户对应角色 - * @param u2rs - */ - void batchInsert(List u2rs); - - int cntUserList(MallUserRole record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 470a4e9cd..79fa81d0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -81,12 +81,6 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { public int cntUserList(MallUserRole record) { return mallUserRoleMapper.selectCount(record); } - - - @Override - public void batchInsert(List u2rs) { - mallUserRoleMapper.insertList(u2rs); - } @Override public void deleteByUserId(Long uid) { From 0259431d5d05ba6a2d6aabc67c965a48c65a3289 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 13 Jun 2019 12:31:23 +0800 Subject: [PATCH 142/289] =?UTF-8?q?[device=E8=AE=BF=E9=97=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81][=E6=96=B0=E5=A2=9E]:=E5=A4=84=E7=90=86Content=20type?= =?UTF-8?q?=20'application/x-www-form-urlencoded;charset=3DUTF-8'=20not=20?= =?UTF-8?q?supported=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/WebConfig.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java index 8b1ecddc9..4cf73f74e 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java @@ -13,6 +13,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.cors.CorsConfiguration; @@ -20,11 +21,14 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CharacterEncodingFilter; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import javax.servlet.Filter; import java.math.BigDecimal; import java.math.BigInteger; +import java.nio.charset.Charset; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; @Configuration @@ -35,6 +39,27 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private RequestInterceptor requestInterceptor; + @Bean + public RequestMappingHandlerAdapter requestMappingHandlerAdapter() { + RequestMappingHandlerAdapter adapter = new RequestMappingHandlerAdapter(); + + List> converters = adapter.getMessageConverters(); + + MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter(); + List supportedMediaTypes = new ArrayList(); + MediaType textMedia = new MediaType(MediaType.TEXT_PLAIN, Charset.forName("UTF-8")); + supportedMediaTypes.add(textMedia); + MediaType jsonMedia = new MediaType(MediaType.APPLICATION_JSON, Charset.forName("UTF-8")); + supportedMediaTypes.add(jsonMedia);jsonConverter.setSupportedMediaTypes(supportedMediaTypes); + + converters.add(jsonConverter); + + + adapter.setMessageConverters(converters); + + return adapter; + } + @Bean public CorsFilter corsFilter() { final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); From 2d94bc9e20e1c7d74fc342f28c84f7e6b5383bb2 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 13 Jun 2019 13:37:05 +0800 Subject: [PATCH 143/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/device/KwBoxV1Controller.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 871b4cd91..17308b8f6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -199,7 +196,8 @@ public class KwBoxV1Controller extends BaseController { if (StringUtil.isNullOrEmpty(time)) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yy/MM/dd,hh:mm:ss±zz"); + SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yy/MM/dd,HH:mm:ss+32"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+:00:00")); Date deviceTime = null; try { deviceTime=simpleDateFormat.parse(time); From 3cafe629c60e9218ca8ff8545248dacd144a0b54 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 13 Jun 2019 13:53:45 +0800 Subject: [PATCH 144/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E6=8E=A5=E5=8F=A3=E4=B8=8D=E8=BF=9B=E8=A1=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/device/KwBoxV1Controller.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 17308b8f6..bd974d528 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -2,7 +2,6 @@ package com.iformall.controller.device; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; From 526ee315acbee7bef8b71855a38512edf21a7861 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:03:27 +0800 Subject: [PATCH 145/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=A2=84=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/mapper/WxBillRentMapper.java | 4 +++ .../impl/WxRentContractServiceImpl.java | 4 ++- .../resources/mapper/WxActivityJoinMapper.xml | 2 +- .../resources/mapper/WxBillRentMapper.xml | 32 ++++++++++++++++++- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index da71820f0..e51eb7eb5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -36,4 +36,8 @@ public interface WxBillRentMapper extends CommonMapper { Long oweBillCount(Long contractId); + void insertBills(List resultList); + + void updateBills(List resultList); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 3075cd8aa..e073622fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1039,10 +1039,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRent.setRentShopType(wxRentContract.getRentShopType()); wxBillRent.setPeriod(++billcount); wxBillRent.setShopInfo(shopInfoStr); - wxBillRentMapper.insertSelective(wxBillRent); + //wxBillRentMapper.insertSelective(wxBillRent); resultList.add(wxBillRent); } + //批量插入账单 + wxBillRentMapper.insertBills(resultList); resultMap.put("billcount",billcount); resultMap.put("billList",resultList); return resultMap; diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 0dac58226..7356c3532 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -78,7 +78,7 @@ resultType="com.iformall.domain.po.WxActivity"> select a.cover_img,a.title,a.activity_start_time,activity_end_time,a.`status` from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id - where aj.user_id=#{user_id} + where aj.user_id=#{userId} and aj.`tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 9868d01de..d018e5e86 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -181,7 +181,37 @@ select count(br.id) from wx_bill_rent br,wx_rent_contract c where c.id = br.rent_contract_id and br.status = 1 and c.id = #{contractId} - + + + INSERT INTO wx_bill_rent (id,rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, + expired_day, + tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, + rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, + pay_way, late_pay_status, comments) + VALUES + + ( + #{item.id},#{item.rentContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, + #{item.expiredDay},#{item.tenantId},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, + #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, + #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, + #{item.payWay},#{item.latePayStatus},#{item.comments} + ) + + + + + + update wx_bill_rent + + updatetime = now(),receive_pay = #{item.receivePay}, + comments = #{item.comments}, + receive_date = #{item.receiveDate}, + status = 3,pay_date=now() + + where id = #{item.id} + + From 85bfc0bb5f90c0d995fba0a2ddfd0f476eaf6873 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 13 Jun 2019 12:34:46 +0800 Subject: [PATCH 146/289] =?UTF-8?q?[device=E8=AE=BF=E9=97=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81][=E6=96=B0=E5=A2=9E]:=E5=A4=84=E7=90=86Content=20type?= =?UTF-8?q?=20'application/x-www-form-urlencoded;charset=3DUTF-8'=20not=20?= =?UTF-8?q?supported=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/config/WebConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java index 4cf73f74e..55248bebc 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/WebConfig.java @@ -50,7 +50,9 @@ public class WebConfig implements WebMvcConfigurer { MediaType textMedia = new MediaType(MediaType.TEXT_PLAIN, Charset.forName("UTF-8")); supportedMediaTypes.add(textMedia); MediaType jsonMedia = new MediaType(MediaType.APPLICATION_JSON, Charset.forName("UTF-8")); - supportedMediaTypes.add(jsonMedia);jsonConverter.setSupportedMediaTypes(supportedMediaTypes); + supportedMediaTypes.add(jsonMedia); + + jsonConverter.setSupportedMediaTypes(supportedMediaTypes); converters.add(jsonConverter); From 76f23f9ca0850b5b2e94a80633e6f5cf59f93eb4 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 13 Jun 2019 14:14:52 +0800 Subject: [PATCH 147/289] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index b72248438..dd21ea44b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -88,6 +88,11 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxShopMapper.rentRateHistory".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxLevelConfigMapper.insertBatch".equals(ms.getId())) + return true; + if ("com.iformall.mapper.WxLevelConfigMapper.batchUpdate".equals(ms.getId())) + return true; + return false; } } From 1a8e624a17227227ed42ecf7b2b533280aae6703 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 13 Jun 2019 14:15:13 +0800 Subject: [PATCH 148/289] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=B7=BB=E5=8A=A0tenantId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxLevelConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 0659bae2f..9ceddd08b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -153,6 +153,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { List levelConfigs = new ArrayList(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() != null && levelConfig.getCount() != null) { + levelConfig.setTenantId(tenantId); levelConfig.setUpdateDate(new Date()); JSONObject jo = new JSONObject(); jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); From a14b5f68eea6d82424d5675b648fff27fa82a749 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 13 Jun 2019 14:18:24 +0800 Subject: [PATCH 149/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E5=8E=BB=E6=8E=89=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/device/KwBoxV1Controller.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index bd974d528..09f40738d 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -174,9 +174,8 @@ public class KwBoxV1Controller extends BaseController { //“TIME”:”19/05/29 08:24:57 +32”, - @ApiOperation("广告列表") + @ApiOperation("开物盒子V1") @PostMapping("command") - @SystemControllerLog(description = "开物盒子v1") public Result v1(@RequestBody Map paramMap) { String cmd = paramMap.get("CMD"); From 37b361e5b6805005dac47beb873d1f34192dda18 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:43:02 +0800 Subject: [PATCH 150/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=A2=84=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/mapper/WxBillPropertyMapper.java | 4 +++ .../impl/WxPropertyContractServiceImpl.java | 5 +-- .../resources/mapper/WxBillPropertyMapper.xml | 32 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index a9cf66e7c..6d8151db0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -38,4 +38,8 @@ public interface WxBillPropertyMapper extends CommonMapper Long oweBillCount(Long contractId); + void updateBills(List resultList); + + void insertBills(List resultList); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 907a3dd2b..f8bd2eb23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -625,10 +625,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (shopInfo != null) { wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo)); } - wxBillPropertyMapper.insertSelective(wxBillProperty); + //wxBillPropertyMapper.insertSelective(wxBillProperty); resultList.add(wxBillProperty); } - + //批量生成预账单 + wxBillPropertyMapper.insertBills(resultList); resultMap.put("billcount",billcount); resultMap.put("billList",resultList); return resultMap; diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 6a290b7d7..3851a40cb 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -183,5 +183,37 @@ select count(br.id) from wx_bill_property br,wx_property_contract c where c.id = br.property_contract_id and br.status = 1 and c.id = #{contractId} + + + INSERT INTO wx_bill_property (id,property_contract_id, receive_pay, pay, receive_date, pay_date, createtime, + expired_day, + tenant_id, owe, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, + rent_shop_type, revenue, late_pay_ratio, late_pay_time, late_pay_price, period, is_preview, shop_info, + pay_way, late_pay_status, comments) + VALUES + + ( + #{item.id},#{item.propertyContractId},#{item.receivePay},#{item.pay},#{item.receiveDate},#{item.payDate},#{item.createtime}, + #{item.expiredDay},#{item.tenantId},#{item.owe},#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId}, + #{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue}, + #{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo}, + #{item.payWay},#{item.latePayStatus},#{item.comments} + ) + + + + + + update wx_bill_rent + + updatetime = now(),receive_pay = #{item.receivePay}, + comments = #{item.comments}, + receive_date = #{item.receiveDate}, + status = 3,pay_date=now() + + where id = #{item.id} + + + From f40cd3366f29c6793ba603f68592f4db84739f21 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:43:51 +0800 Subject: [PATCH 151/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E7=AD=BE=E5=88=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxActivityJoinController.java | 4 ++-- .../com/iformall/domain/po/WxActivity.java | 21 +++++++++++++------ .../impl/WxActivityJoinServiceImpl.java | 14 +++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java index 75375e299..54c97ac34 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java @@ -55,8 +55,8 @@ public class WxActivityJoinController extends BaseController { @ApiOperation("签到") @PostMapping("sign") public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { - if (wxActivityJoin.getId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id不能为空"); + if (wxActivityJoin.getActivityId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); } wxActivityJoin.setTenantId(getTenantId()); wxActivityJoin.setUserId(getUserId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 66155b3cf..00d7275fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -94,27 +94,36 @@ public class WxActivity extends BaseEntity { @Transient - @io.swagger.annotations.ApiModelProperty(value = "小程序路径", name = "weappPath") + @io.swagger.annotations.ApiModelProperty(value = "报名小程序路径", name = "weappPath") protected String weappPath; @Transient @io.swagger.annotations.ApiModelProperty(value = "报名二维码", name = "weappSceneForJoin") protected String weappSceneForJoin; - public String getWeappSceneForSign() { + public String getWeappPath() { + return "pages/index/index?type=ra&id=" + id; + } + + public String getWeappSceneForJoin() { return "t:ra:" + id; } + + @Transient + @io.swagger.annotations.ApiModelProperty(value = "签到小程序路径", name = "weappPath") + protected String weappPathForSign; + @Transient @io.swagger.annotations.ApiModelProperty(value = "签到二维码", name = "weappSceneForSign") protected String weappSceneForSign; - public String getWeappPath() { - return "pages/index/index?type=ra&id=" + id; + public String getWeappPathForSign() { + return "pages/index/index?type=si&id=" + id; } - public String getWeappSceneForJoin() { - return "t:ra:" + id; + public String getWeappSceneForSign() { + return "t:si:" + id; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index a5117a9f9..6f1decac8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -164,13 +164,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sign(WxActivityJoin wxActivityJoin) { - WxActivityJoin activityJoin = wxActivityJoinMapper.selectByPrimaryKey(wxActivityJoin.getId()); - if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) { - activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); - wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); - return new ResultData(Result.SUCCESS); + //是否报名记录 + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + WxActivityJoin activityJoin = wxActivityJoinMapper.selectOne(wxActivityJoin); + if (activityJoin == null) { + return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); } - return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND); + activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); + wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); + return new ResultData(Result.SUCCESS); } private void sendMessage(WxActivityJoin join, WxActivity activity) { From 1f2768f563b1ef68ca2ab9637627dc9b653e6071 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 14:52:24 +0800 Subject: [PATCH 152/289] =?UTF-8?q?[=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 7356c3532..e99881dbc 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -76,7 +76,7 @@ From 22186c9e49916b13addd996a067d1bc83ad7cd86 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 15:28:24 +0800 Subject: [PATCH 156/289] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 4 +--- .../service/impl/WxRentContractServiceImpl.java | 10 +++------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index f8bd2eb23..e306f9d32 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -204,9 +204,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ - for (WxBillProperty wxBillProperty:record.getPreviewBillRentList()) { - wxBillPropertyMapper.update(wxBillProperty); - } + wxBillPropertyMapper.updateBills(record.getPreviewBillRentList()); haspreview = true; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index e073622fa..4d3016545 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -424,9 +424,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { // 保存调整金额(预账单调整) if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ - for (WxBillRent billRent:record.getPreviewBillRentList()) { - wxBillRentMapper.update(billRent); - } + wxBillRentMapper.updateBills(record.getPreviewBillRentList()); } WxRentContract wxRentContract = (WxRentContract)resultData.data; wxRentContract.setPreviewBillRentList(resultList); @@ -1272,11 +1270,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override @Transactional(rollbackFor = {Exception.class}) public ResultData updateFile(WxRentContract record, Long userId,String userName,Date oldRentStartDate) { - // 保存调整金额(预账单调整) + // 保存调整金额(预账单调整)w if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ - for (WxBillRent wxBillRent:record.getPreviewBillRentList()) { - wxBillRentMapper.update(wxBillRent); - } + wxBillRentMapper.updateBills(record.getPreviewBillRentList()); } ResultData resultData = getResultDataForUpdate(record, userId,0,oldRentStartDate); if (resultData.code != Result.SUCCESS) { From 295fb525243c35e03248064c232fe3af62da14b4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 15:30:01 +0800 Subject: [PATCH 157/289] =?UTF-8?q?[=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxActivityJoinMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index cccbd9e43..c52582920 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -76,7 +76,7 @@ From 7c4d08eeb5b6018cff3b9df65cf24ff6e5b7d8e3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 13 Jun 2019 17:05:49 +0800 Subject: [PATCH 162/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 100 +++++++++++++----- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 626e0174e..0360ddf3b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -384,7 +384,7 @@ public class WxFlowServiceImpl implements WxFlowService { map.put("flowType",flowType); map.put("variables",variables); map.put("supplement",supplement); - map.put("taskAssignee",flowModel.getLists()); + map.put("taskAssignee",flowModel.getFlow()); ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(flowModel.getFlowId(), map); logger.debug("流程启动,流程id:{}",processInstance.getId()); @@ -622,41 +622,87 @@ public class WxFlowServiceImpl implements WxFlowService { } Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); Map mapInfo = taskService.getVariables(task.getId()); - List taskAssigneeList = (List)mapInfo.get("taskAssignee"); + Integer flowType = (Integer)mapInfo.get("flowType"); - for (int i = 0; i < taskAssigneeList.size(); i++) { - UserTaskVo assignee = taskAssigneeList.get(i); - if(task.getTaskDefinitionKey().equals(assignee.getKey())){ - //设置当前节点代办人信息 - String userName = ""; - for (FlowUserVo userVo:assignee.getUserList()) { - userName += userVo.getName()+" "; - } - WxFlowRecord wxFlowRecord = new WxFlowRecord(); - wxFlowRecord.setUserName(userName.trim()); - wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); - resultList.add(0,wxFlowRecord); - - //不是最后一个节点,设置下一个待审批节点代办人 - if(i != taskAssigneeList.size()-1){ - assignee = taskAssigneeList.get(i+1); - // 下一个节点没设置代办人 - if(CollectionUtils.isEmpty(assignee.getUserList())){ - continue; + if(flowType.intValue() <= EnumFlowKey.END_CONTRACT.getCode().intValue()){ + //老数据 + List> taskAssigneeList = (List)mapInfo.get("taskAssignee"); + for (int i = 0; i < taskAssigneeList.size(); i++) { + Map assignee = taskAssigneeList.get(i); + if(task.getTaskDefinitionKey().equals(assignee.get("taskKey"))){ + //设置当前节点代办人信息 + String[] assigneeArray = assignee.get("assignee").split(","); + String userName = ""; + for (String userid:assigneeArray) { + MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid)); + userName += mallUserInfo.getName()+" "; + } + WxFlowRecord wxFlowRecord = new WxFlowRecord(); + wxFlowRecord.setUserName(userName.trim()); + wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + resultList.add(0,wxFlowRecord); + + //不是最后一个节点,设置下一个待审批节点代办人 + if(i != taskAssigneeList.size()-1){ + assignee = taskAssigneeList.get(i+1); + // 下一个节点没设置代办人 + if(StringUtils.isBlank(assignee.get("assignee"))){ + continue; + } + assigneeArray = assignee.get("assignee").split(","); + userName = ""; + for (String userid:assigneeArray) { + MallUserInfo mallUserInfo = this.mallUserInfoService.getById(Long.parseLong(userid)); + userName += mallUserInfo.getName()+" "; + } + + wxFlowRecord = new WxFlowRecord(); + wxFlowRecord.setUserName(userName.trim()); + wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + resultList.add(0,wxFlowRecord); + break; } - userName = ""; + }else{ + continue; + } + } + }else{ + WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue((String)mapInfo.get("taskAssignee"),WxFlowModel.class); + List taskAssigneeList = flowModel.getLists(); + for (int i = 0; i < taskAssigneeList.size(); i++) { + UserTaskVo assignee = taskAssigneeList.get(i); + if(task.getTaskDefinitionKey().equals(assignee.getKey())){ + //设置当前节点代办人信息 + String userName = ""; for (FlowUserVo userVo:assignee.getUserList()) { userName += userVo.getName()+" "; } - - wxFlowRecord = new WxFlowRecord(); + WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); resultList.add(0,wxFlowRecord); - break; + + //不是最后一个节点,设置下一个待审批节点代办人 + if(i != taskAssigneeList.size()-1){ + assignee = taskAssigneeList.get(i+1); + // 下一个节点没设置代办人 + if(CollectionUtils.isEmpty(assignee.getUserList())){ + continue; + } + userName = ""; + for (FlowUserVo userVo:assignee.getUserList()) { + userName += userVo.getName()+" "; + } + + wxFlowRecord = new WxFlowRecord(); + wxFlowRecord.setUserName(userName.trim()); + wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + resultList.add(0,wxFlowRecord); + break; + } + }else{ + continue; } - }else{ - continue; } } // 设置最后一个发起节点 From 89c48a7e4b844b8e2d0cd97461620848c14e5d91 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 17:22:25 +0800 Subject: [PATCH 163/289] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/mem/WxCUserBasicInfoController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index e32e5b7f4..3bd4b1c09 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -463,6 +463,9 @@ public class WxCUserBasicInfoController extends BaseController { @SystemControllerLog(description = "会员管理-根据手机号查询接口") public ResultData findByPhone(String phone) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone"); + if (StringUtils.isEmpty(phone)) { + return new ResultData(new ArrayList()); + } List wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { From 8796746e62cfdbb661849e2c260c7e8c6e32f679 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 13 Jun 2019 17:41:50 +0800 Subject: [PATCH 164/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0360ddf3b..0034ff546 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -134,7 +134,7 @@ public class WxFlowServiceImpl implements WxFlowService { contractType = Integer.parseInt(str); } - if(EnumFlowKey.CONTRACT.getCode().equals(flowType)){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType)){ // 1租赁合同 2点位合同 3物业 4点位物业合同 if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); @@ -159,7 +159,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContractService.updatePropertyContractStatus(businessId); } } - }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType)){ + }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType)){ if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); rent.setId(businessId); @@ -206,7 +206,7 @@ public class WxFlowServiceImpl implements WxFlowService { } wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); } - } else if (EnumFlowKey.BILL.getCode().equals(flowType)) { + } else if (EnumFlowKey.BILL.getCode().equals(flowType) || EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)) { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { //账单审批 Integer billType = (Integer) getVariableByKey(variables, "billType"); From be961b7031715d0b5ae6daf2f7c9753a65414940 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 13 Jun 2019 19:14:15 +0800 Subject: [PATCH 165/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0034ff546..821e00ce3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -779,7 +779,6 @@ public class WxFlowServiceImpl implements WxFlowService { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); wxMsgValidationcode.setTenantId(tenantId); Map userMap = (Map)mapInfo.get("starter"); - List> taskAssigneeList = (List)mapInfo.get("taskAssignee"); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); String email = (String)userMap.get("email"); List> variables = (List)mapInfo.get("variables"); @@ -787,7 +786,18 @@ public class WxFlowServiceImpl implements WxFlowService { // 判断下个节点是否有设置审批人,没有,直接通过,有,发短信通知 if(!isEnded(processInstanceId)){ - if(hasAssignee(taskAssigneeList,taskKey,processInstanceId)){ + boolean hasAssignee; + if(flowType.intValue() <= EnumFlowKey.END_CONTRACT.getCode().intValue()) { + //老数据 + List> taskAssigneeList = (List) mapInfo.get("taskAssignee"); + hasAssignee = hasAssignee(taskAssigneeList,taskKey,processInstanceId); + }else{ + WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue((String)mapInfo.get("taskAssignee"),WxFlowModel.class); + List taskAssigneeList = flowModel.getLists(); + hasAssignee = hasAssigneeForNew(taskAssigneeList,taskKey,processInstanceId); + } + + if(hasAssignee){ // 给代办人发送通知短信 String assignee = ""; List mallUserInfoList = getUserByProcessInstanceId(processInstanceId); @@ -895,6 +905,25 @@ public class WxFlowServiceImpl implements WxFlowService { * @param taskKey * @param processInstanceId */ + public boolean hasAssigneeForNew(List taskAssigneeList,String taskKey,String processInstanceId){ + boolean has = true; + for (int i = 0; i < taskAssigneeList.size(); i++) { + UserTaskVo taskAssignee = taskAssigneeList.get(i); + if(taskAssignee.getKey().equals(taskKey)){ + if(i != taskAssigneeList.size() -1){ + UserTaskVo nextTaskAssignee = taskAssigneeList.get(i+1); + if(CollectionUtils.isEmpty(nextTaskAssignee.getUserList())){ + Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); + taskService.complete(task.getId()); + has = false; + break; + } + } + } + } + return has; + } + public boolean hasAssignee(List> taskAssigneeList,String taskKey,String processInstanceId){ boolean has = true; for (int i = 0; i < taskAssigneeList.size(); i++) { From e35e061538838b199f72428e9e0d36751da28960 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 13 Jun 2019 19:39:37 +0800 Subject: [PATCH 166/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E9=87=8D=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 3 ++- .../iformall/service/impl/WxActivityJoinServiceImpl.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 686227c77..7feaec25b 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -434,7 +434,8 @@ public enum ErrorCode{ * 活动 */ ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), - ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动") + ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"), + ACTIVITY_JOINED(30002, "您已报名该活动") ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 6f1decac8..373bb0d88 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -132,6 +132,14 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override public ResultData join(WxActivityJoin wxActivityJoin) { + + WxActivityJoin joinQuery = new WxActivityJoin(); + joinQuery.setUserId(wxActivityJoin.getUserId()); + joinQuery.setActivityId(wxActivityJoin.getActivityId()); + int count = wxActivityJoinMapper.selectCount(joinQuery); + if (count > 0) { + return new ResultData(ErrorCode.ACTIVITY_JOINED); + } WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); //保存到报名表中 final IdWorker idWorker = IdWorker.get(); From 0aa41b0b087dd62ab3afd4d81a91ea374f64b81c Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 13 Jun 2019 19:50:42 +0800 Subject: [PATCH 167/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 821e00ce3..260115c2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1261,8 +1261,11 @@ public class WxFlowServiceImpl implements WxFlowService { } else if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); mi.setLoopCardinality(userIdList.size()+""); - mi.setCollectionString(collection); +// mi.setCollectionString(collection); + mi.setInputDataItem(collection); +// mi.setElementVariable("assignee"); userTask.setLoopCharacteristics(mi); +// userTask.setCandidateUsers(userIdList); } userTask.setIncomingFlows(Arrays.asList(flowList.get(i))); From 82c7ded0d1800f7b6b2dbc5264d6dbae2b586955 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 08:26:50 +0800 Subject: [PATCH 168/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E9=87=8D=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxActivityJoinServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 373bb0d88..bb4d3dca6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -141,20 +141,12 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { return new ResultData(ErrorCode.ACTIVITY_JOINED); } WxCUser user = wxCUserMapper.selectByPrimaryKey(wxActivityJoin.getUserId()); - //保存到报名表中 - final IdWorker idWorker = IdWorker.get(); - wxActivityJoin.setId(idWorker.nextId()); - wxActivityJoin.setPhone(user.getPhone()); - Date date = new Date(); - wxActivityJoin.setCreateTime(date); - wxActivityJoin.setUpdateTime(date); - wxActivityJoinMapper.insertSelective(wxActivityJoin); //查询是否消耗积分 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { Integer userCredit = user.getCredit(); Integer credit = wxActivity.getCredit(); - Map data = new HashMap<>(); + Map data = new HashMap<>(2); if (credit > userCredit) { data.put("useCredit", credit); data.put("totalCredit", userCredit); @@ -165,8 +157,15 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { wxCUserMapper.updateByPrimaryKeySelective(user); data.put("useCredit", credit); data.put("totalCredit", userCredit); - return new ResultData(data); } + //保存到报名表中 + final IdWorker idWorker = IdWorker.get(); + wxActivityJoin.setId(idWorker.nextId()); + wxActivityJoin.setPhone(user.getPhone()); + Date date = new Date(); + wxActivityJoin.setCreateTime(date); + wxActivityJoin.setUpdateTime(date); + wxActivityJoinMapper.insertSelective(wxActivityJoin); return new ResultData(); } From 8aa03ffb5e7266a69e7067f78daec3e311a3eaa6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 10:20:36 +0800 Subject: [PATCH 169/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=AD=BE=E5=88=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index bb4d3dca6..e5bd4d598 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -179,7 +179,9 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { } activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode()); wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin); - return new ResultData(Result.SUCCESS); + //查询活动名称 + WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); + return new ResultData(Result.SUCCESS, "签到成功", activity.getTitle()); } private void sendMessage(WxActivityJoin join, WxActivity activity) { From 662a4da172153e191c32c4cb75bf270b31619448 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 11:03:15 +0800 Subject: [PATCH 170/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=B7=BB=E5=8A=A0=E4=BC=9A=E7=AD=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 260115c2f..229ac1a22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -610,6 +610,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(CollectionUtils.isEmpty(resultList)){ return new ResultData(); } + Integer flowType = resultList.get(0).getBusinessType(); String processInstanceId = resultList.get(0).getProcessInstanceId(); ProcessInstance pi = null; try { @@ -620,12 +621,11 @@ public class WxFlowServiceImpl implements WxFlowService { if(pi == null){ return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); } - Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); - Map mapInfo = taskService.getVariables(task.getId()); - Integer flowType = (Integer)mapInfo.get("flowType"); if(flowType.intValue() <= EnumFlowKey.END_CONTRACT.getCode().intValue()){ //老数据 + Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); + Map mapInfo = taskService.getVariables(task.getId()); List> taskAssigneeList = (List)mapInfo.get("taskAssignee"); for (int i = 0; i < taskAssigneeList.size(); i++) { Map assignee = taskAssigneeList.get(i); @@ -667,11 +667,14 @@ public class WxFlowServiceImpl implements WxFlowService { } } }else{ - WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue((String)mapInfo.get("taskAssignee"),WxFlowModel.class); + List taskList = taskService.createTaskQuery().processInstanceId(pi.getId()).list(); + //Map mapInfo = taskService.getVariables(task.getId()); + WxFlowModel flowModelDb = getModelByType(flowType,tenantId); + WxFlowModel flowModel = (WxFlowModel)JsonUtil.readValue(flowModelDb.getFlow(),WxFlowModel.class); List taskAssigneeList = flowModel.getLists(); for (int i = 0; i < taskAssigneeList.size(); i++) { UserTaskVo assignee = taskAssigneeList.get(i); - if(task.getTaskDefinitionKey().equals(assignee.getKey())){ + if(taskList.get(0).getTaskDefinitionKey().equals(assignee.getKey())){ //设置当前节点代办人信息 String userName = ""; for (FlowUserVo userVo:assignee.getUserList()) { @@ -1245,27 +1248,14 @@ public class WxFlowServiceImpl implements WxFlowService { userTask.setName("节点" + (i + 1)); userTask.setId("userTask" + (i + 1)); List userIdList = new ArrayList<>(); - String collection = ""; - for (int j = 0; j < taskVo.getUserList().size(); j++) { - FlowUserVo userVo = taskVo.getUserList().get(j); - userIdList.add(userVo.getId() + ""); - if(j==taskVo.getUserList().size()-1){ - collection += userVo.getId(); - }else{ - collection += userVo.getId()+","; - } - } if (EnumTaskType.NORMAL.getCode().equals(taskVo.getType()) || EnumTaskType.OR.getCode().equals(taskVo.getType())) { userTask.setCandidateUsers(userIdList); } else if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { + userTask.setCandidateUsers(userIdList); MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); mi.setLoopCardinality(userIdList.size()+""); -// mi.setCollectionString(collection); - mi.setInputDataItem(collection); -// mi.setElementVariable("assignee"); userTask.setLoopCharacteristics(mi); -// userTask.setCandidateUsers(userIdList); } userTask.setIncomingFlows(Arrays.asList(flowList.get(i))); From 51f9963fd214f0982e22a40f0b675d11f2243dee Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 13:31:20 +0800 Subject: [PATCH 171/289] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906141150__L_ALTER_MENU.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql new file mode 100644 index 000000000..9bbb5f9eb --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906141150__L_ALTER_MENU.sql @@ -0,0 +1,4 @@ +update mall_permission set name = '多经点位租金合同' where name ='多经点位租赁合同'; +INSERT INTO `mall_permission` (`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) +VALUES + (305, '多经点位租赁合同', 3, 'Y', NULL, 1, NULL, NULL, 'pointLeaselist', 'icon-wuyehetong', 0, 305); \ No newline at end of file From 5174b9b9c02977aacd2a84e5430d1b5ec9a392cd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 13:57:55 +0800 Subject: [PATCH 172/289] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=9B=B4=E6=94=B9=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rent/WxBillAllController.java | 12 +- .../com/iformall/domain/vo/WxBillAll.java | 7 + .../iformall/service/WxBillAllService.java | 4 + .../service/impl/WxBillAllServiceImpl.java | 134 +++++++++++++++++ .../service/impl/WxFlowServiceImpl.java | 136 ++---------------- 5 files changed, 164 insertions(+), 129 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index ff17018cb..7be63c8b8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -12,10 +12,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -148,5 +145,12 @@ public class WxBillAllController extends BaseController { wxBillAllService.exportOweBill(wxBillAll, request, response); } + @PostMapping("updateReceivePay") + @SystemControllerLog(description = "账单-更新") + public ResultData updateReceivePay(@RequestBody WxBillAll wxBillAll) { + logger.debug("[" + getIpAddr() + "] WxBillRentController::add"); + wxBillAll.setTenantId(getTenantId()); + return wxBillAllService.updateReceivePay(wxBillAll, getUser()); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 3012d792f..d71f5c698 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -126,4 +126,11 @@ public class WxBillAll extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") private Integer filterHasPay; + + + @io.swagger.annotations.ApiModelProperty(value = "金额旧值", name = "oldPrice") + private Long oldPrice; + @io.swagger.annotations.ApiModelProperty(value = "金额新值", name = "newPrice") + private Long newPrice; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 62db32707..ce95a280a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -1,6 +1,7 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.vo.WxBillAll; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,4 +52,7 @@ public interface WxBillAllService { void exportOweBill(WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response); + ResultData updateReceivePay(WxBillAll wxBillAll, MallUserInfo user); + + void addBillAction(Long billId, Long oldPrice, Long newPrice, MallUserInfo mallUserInfo); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 69db4816a..5bfca0f61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -751,6 +751,140 @@ public class WxBillAllServiceImpl implements WxBillAllService { } + @Override + public ResultData updateReceivePay(WxBillAll wxBillAll, MallUserInfo user) { + Integer billType = wxBillAll.getBillTypeValue(); + Long oldPrice = wxBillAll.getOldPrice(); + Long newPrice = wxBillAll.getNewPrice(); + Long id = wxBillAll.getId(); + Date updateDate = new Date(); + if (billType.equals(EnumBillTypeParam.RENT.getCode())) { + WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(id); + //租赁账单更新 + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setId(id); + wxBillRent.setReceivePay(newPrice); + wxBillRent.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillRent.setUpdatetime(updateDate); + wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { + WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(id); + //租赁押金账单更新 + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + wxBillDeposit.setId(id); + wxBillDeposit.setReceivePay(newPrice); + wxBillDeposit.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillDeposit.setUpdatetime(updateDate); + wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { + WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(id); + //物业账单更新 + WxBillProperty wxBillProperty = new WxBillProperty(); + wxBillProperty.setId(id); + wxBillProperty.setReceivePay(newPrice); + wxBillProperty.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillProperty.setUpdatetime(updateDate); + wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(id); + //物业押金账单更新 + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + wxBillPropertyDeposit.setId(id); + wxBillPropertyDeposit.setReceivePay(newPrice); + wxBillPropertyDeposit.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillPropertyDeposit.setUpdatetime(updateDate); + wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { + //水费账单更新 + updateDailyBill(id, newPrice, updateDate); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.POWER.getCode())) { + //电费账单更新 + updateDailyBill(id, newPrice, updateDate); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.AIR_CONDITIONING.getCode())) { + //空调费账单更新 + updateDailyBill(id, newPrice, updateDate); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { + WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(id); + //其他费用账单更新 + WxBillOther wxBillOther = new WxBillOther(); + wxBillOther.setId(id); + wxBillOther.setReceivePay(newPrice); + wxBillOther.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillOther.setUpdatetime(updateDate); + wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { + WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(id); + //其他押金账单更新 + WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); + wxBillOtherDeposit.setId(id); + wxBillOtherDeposit.setReceivePay(newPrice); + wxBillOtherDeposit.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillOtherDeposit.setUpdatetime(updateDate); + wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); + //账单日志 + addBillAction(id, oldPrice, newPrice, user); + } else { + logger.info("未找到账单类型"); + } + return new ResultData(); + } + + @Override + public void addBillAction(Long billId, Long oldPrice, Long newPrice, MallUserInfo mallUserInfo) { + WxBillAction wxBillAction = new WxBillAction(); + wxBillAction.setBillId(billId); + wxBillAction.setOldPrice(oldPrice); + wxBillAction.setNewPrice(newPrice); + wxBillActionService.modifyBill(wxBillAction, mallUserInfo); + } + + public void updateDailyBill(Long businessId, Long newPrice, Date updateDate) { + WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(businessId); + WxBillDaily wxBillDaily = new WxBillDaily(); + wxBillDaily.setId(businessId); + wxBillDaily.setReceivePay(newPrice); + wxBillDaily.setOwe(newPrice - dbBill.getPay()); + if (newPrice.equals(dbBill.getPay())) { + wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); + } + wxBillDaily.setUpdatetime(updateDate); + wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); + } + @Override public Object getBillInfo(WxBillAll record) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 229ac1a22..b634cead5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.WxMsgRecord; import com.iformall.domain.vo.FlowUserVo; import com.iformall.domain.vo.UserTaskVo; +import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -100,6 +101,9 @@ public class WxFlowServiceImpl implements WxFlowService { private WxFlowModelMapper wxFlowModelMapper; @Autowired private WxFlowConfigMapper wxFlowConfigMapper; + @Autowired + private WxBillAllService wxBillAllService; + /** * 获取流程key @@ -212,135 +216,17 @@ public class WxFlowServiceImpl implements WxFlowService { Integer billType = (Integer) getVariableByKey(variables, "billType"); Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString()); Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString()); - Date updateDate = new Date(); - MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); - if (billType.equals(EnumBillTypeParam.RENT.getCode())) { - WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(businessId); - //租赁账单更新 - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setId(businessId); - wxBillRent.setReceivePay(newPrice); - wxBillRent.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillRent.setUpdatetime(updateDate); - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { - WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(businessId); - //租赁押金账单更新 - WxBillDeposit wxBillDeposit = new WxBillDeposit(); - wxBillDeposit.setId(businessId); - wxBillDeposit.setReceivePay(newPrice); - wxBillDeposit.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillDeposit.setUpdatetime(updateDate); - wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { - WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(businessId); - //物业账单更新 - WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setId(businessId); - wxBillProperty.setReceivePay(newPrice); - wxBillProperty.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillProperty.setUpdatetime(updateDate); - wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { - WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(businessId); - //物业押金账单更新 - WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); - wxBillPropertyDeposit.setId(businessId); - wxBillPropertyDeposit.setReceivePay(newPrice); - wxBillPropertyDeposit.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillPropertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillPropertyDeposit.setUpdatetime(updateDate); - wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { - //水费账单更新 - updateDailyBill(businessId, newPrice, updateDate); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.POWER.getCode())) { - //电费账单更新 - updateDailyBill(businessId, newPrice, updateDate); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.AIR_CONDITIONING.getCode())) { - //空调费账单更新 - updateDailyBill(businessId, newPrice, updateDate); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { - WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(businessId); - //其他费用账单更新 - WxBillOther wxBillOther = new WxBillOther(); - wxBillOther.setId(businessId); - wxBillOther.setReceivePay(newPrice); - wxBillOther.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillOther.setUpdatetime(updateDate); - wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { - WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(businessId); - //其他押金账单更新 - WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); - wxBillOtherDeposit.setId(businessId); - wxBillOtherDeposit.setReceivePay(newPrice); - wxBillOtherDeposit.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillOtherDeposit.setUpdatetime(updateDate); - wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); - //账单日志 - addBillAction(businessId, oldPrice, newPrice, mallUserInfo); - } else { - logger.info("未找到账单类型"); - } + MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setId(businessId); + wxBillAll.setBillTypeValue(billType); + wxBillAll.setOldPrice(oldPrice); + wxBillAll.setNewPrice(newPrice); + wxBillAllService.updateReceivePay(wxBillAll, user); } } } - public void updateDailyBill(Long businessId, Long newPrice, Date updateDate) { - WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(businessId); - WxBillDaily wxBillDaily = new WxBillDaily(); - wxBillDaily.setId(businessId); - wxBillDaily.setReceivePay(newPrice); - wxBillDaily.setOwe(newPrice - dbBill.getPay()); - if (newPrice.equals(dbBill.getPay())) { - wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); - } - wxBillDaily.setUpdatetime(updateDate); - wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); - } - - public void addBillAction(Long billId, Long oldPrice, Long newPrice, MallUserInfo mallUserInfo) { - WxBillAction wxBillAction = new WxBillAction(); - wxBillAction.setBillId(billId); - wxBillAction.setOldPrice(oldPrice); - wxBillAction.setNewPrice(newPrice); - wxBillActionService.modifyBill(wxBillAction, mallUserInfo); - } - public Map mallUserInfoToMap(MallUserInfo userInfo){ try { Map map = new HashMap<>(); From 3b5fe9f73287e371a15c180652a7970b3f6a3883 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 13:58:24 +0800 Subject: [PATCH 173/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentPropertyContractController.java | 24 ++-- .../service/WxRentContractService.java | 4 - .../WxRentPropertyContractService.java | 19 +++ .../impl/WxRentContractServiceImpl.java | 35 +---- .../WxRentPropertyContractServiceImpl.java | 121 ++++++++++++++++++ 5 files changed, 161 insertions(+), 42 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 1ee2fe6fd..ced485fea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -4,18 +4,17 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; -import com.iformall.service.WxRentContractService; +import com.iformall.service.WxRentPropertyContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author gongbiao @@ -26,7 +25,7 @@ public class WxRentPropertyContractController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - private WxRentContractService wxRentContractService; + private WxRentPropertyContractService wxRentPropertyContractService; @GetMapping("list") @ApiImplicitParams({ @@ -39,7 +38,7 @@ public class WxRentPropertyContractController extends BaseController { wxRentPropertyContractVo = new WxRentPropertyContractVo(); } wxRentPropertyContractVo.setTenantId(getTenantId()); - final PageInfo page = wxRentContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + final PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); return new ResultData(page); } @@ -49,7 +48,16 @@ public class WxRentPropertyContractController extends BaseController { @SystemControllerLog(description = "租赁物业合同-根据id查询接口") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById"); - return wxRentContractService.getContractInfo(id); + return wxRentPropertyContractService.getContractInfo(id); + } + + @PostMapping("insertRentForCreate") + @SystemControllerLog(description = "租赁合同-添加") + public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::insertRentForCreate"); + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + return wxRentPropertyContractService.insertRentForCreate(wxRentContract); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index d40a744ad..f60e9c1f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -88,8 +88,4 @@ public interface WxRentContractService { Integer getShopType(WxRentContract wxRentContract); - PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize); - - ResultData getContractInfo(Long id); - } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java new file mode 100644 index 000000000..87af04277 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java @@ -0,0 +1,19 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; + +/** + * @author gongbiao + */ +public interface WxRentPropertyContractService { + + PageInfo listContractVo(WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize); + + ResultData getContractInfo(Long id); + + ResultData insertRentForCreate(WxRentContract wxRentContract); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9efe29d20..436066ff9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -10,7 +10,6 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.BillTimeVo; -import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -25,16 +24,17 @@ import org.apache.shiro.SecurityUtils; import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; +import org.joda.time.DateTime; +import org.joda.time.Months; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.joda.time.DateTime; -import org.joda.time.Months; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; @@ -1857,31 +1857,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { return wxRentContractMapper.getShopType(wxRentContract); } - @Override - public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); - } - - @Override - public ResultData getContractInfo(Long id) { - Map data = new HashMap<>(); - Map rent = getById(id); - data.put("rent", rent); - WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); - wxPropertyContractQuery.setRentContractId(id); - WxPropertyContract wxPropertyContract = wxPropertyContractMapper.select(wxPropertyContractQuery).parallelStream() - .filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || - p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || - p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) - .findFirst().orElseGet(null); - data.put("property", wxPropertyContract); - if (wxPropertyContract != null) { - Map property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); - data.put("property", property); - } - return new ResultData(data); - } - public static double getMonthNeedPay(Double price,Date start,Date end){ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java new file mode 100644 index 000000000..ba8d9b97c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -0,0 +1,121 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; +import com.iformall.enums.EnumRentContractStatus; +import com.iformall.mapper.*; +import com.iformall.service.*; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author gongbiao + */ +@Service +public class WxRentPropertyContractServiceImpl implements WxRentPropertyContractService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private String fmUploadDir; + + @Autowired + WxRentContractMapper wxRentContractMapper; + + @Autowired + WxShopMapper wxShopMapper; + + @Autowired + WxMerchantService wxMerchantService; + + @Autowired + WxBillRentMapper wxBillRentMapper; + + @Autowired + WxBillDepositMapper wxBillDepositMapper; + + @Autowired + WxPropertyContractMapper wxPropertyContractMapper; + + @Autowired + WxMerchantMapper wxMerchantMapper; + + @Autowired + WxBusinessMapper wxBusinessMapper; + + @Autowired + WxMallMapper wxMallMapper; + + @Autowired + WxBrandMapper WxBrandMapper; + + @Autowired + WxFlowRecordService wxFlowRecordService; + + @Autowired + RuntimeService runtimeService; + + @Autowired + private TaskService taskService; + + @Autowired + private WxFlowService wxFlowService; + + @Autowired + WxMerchantShopMapper wxMerchantShopMapper; + + @Autowired + WxFlowRecordMapper wxFlowRecordMapper; + + @Autowired + WxPropertyContractService wxPropertyContractService; + + @Autowired + WxRentContractService wxRentontractService; + + @Override + public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); + } + + @Override + public ResultData getContractInfo(Long id) { + Map data = new HashMap<>(); + Map rent = wxRentontractService.getById(id); + data.put("rent", rent); + WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); + wxPropertyContractQuery.setRentContractId(id); + WxPropertyContract wxPropertyContract = wxPropertyContractMapper.select(wxPropertyContractQuery).parallelStream() + .filter(p -> p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode()) || + p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || + p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())) + .findFirst().orElseGet(null); + data.put("property", wxPropertyContract); + if (wxPropertyContract != null) { + Map property = wxPropertyContractService.getById(wxPropertyContract.getRentContractId()); + data.put("property", property); + } + return new ResultData(data); + } + + @Override + public ResultData insertRentForCreate(WxRentContract wxRentContract) { + return null; + } +} + + + + + + From a1212b98eb8bcfd353040e17431e1d6cf51c7552 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 14:08:32 +0800 Subject: [PATCH 174/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 80 ++++++++++++++----- 1 file changed, 60 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index b634cead5..7903a9d71 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -254,7 +254,7 @@ public class WxFlowServiceImpl implements WxFlowService { Boolean supplement = (Boolean)params.get("supplement"); WxFlowModel flowModel = getModelByType(flowType,tenantId); - if(StringUtils.isBlank(flowModel.getFlowId())){ + if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){ return new ResultData(ResultData.ERROR, "您尚未设置审批模板,请先设置。"); } @@ -310,9 +310,14 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); wxMsgRecord.setReceiver(phone); wxMsgRecord.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ dynamicContentMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ dynamicContentMap.put("bustype","账单"); dynamicContentMap.put("contract", businessId.toString()); } @@ -386,11 +391,16 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ - msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ - msgReplaceMap.put("bustype","账单"); - msgReplaceMap.put("contract", businessId.toString()); + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ + dynamicContentMap.put("bustype","合同"); + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + dynamicContentMap.put("bustype","账单"); + dynamicContentMap.put("contract", businessId.toString()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); @@ -706,9 +716,14 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -725,9 +740,14 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -754,9 +774,14 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -773,9 +798,14 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -888,9 +918,14 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -914,9 +949,14 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ + }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } From 73747651cce45009e4d27cf6b90713838598cc77 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 14:27:48 +0800 Subject: [PATCH 175/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BC=9A=E7=AD=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxFlowServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 7903a9d71..054247257 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1174,6 +1174,9 @@ public class WxFlowServiceImpl implements WxFlowService { userTask.setName("节点" + (i + 1)); userTask.setId("userTask" + (i + 1)); List userIdList = new ArrayList<>(); + for (FlowUserVo userVo:taskVo.getUserList()) { + userIdList.add(userVo.getId() + ""); + } if (EnumTaskType.NORMAL.getCode().equals(taskVo.getType()) || EnumTaskType.OR.getCode().equals(taskVo.getType())) { userTask.setCandidateUsers(userIdList); From beda7fe76a7a48f359f9a8dc96f36e751704f37a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 14:53:01 +0800 Subject: [PATCH 176/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxRentContractMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index ba1b8bff5..f7428762c 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -319,7 +319,7 @@ select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status, rc.rent_shop_type,rc.rent_info,pc.price as property_price - from wx_rent_contract rc inner join wx_property_contract pc on rc.id=pc.rent_contract_id + from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id left join wx_shop s on rc.shop_id=s.id rc.tenant_id=#{tenantId} From 81e09e31c8f025a75a901adf38ee255345725118 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 14:53:26 +0800 Subject: [PATCH 177/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BC=9A=E7=AD=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 11 ++-- .../impl/WxRentContractServiceImpl.java | 55 +++++++++---------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 524ff5c6e..fbf0aa513 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -331,11 +331,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } //启动审批流 - if(!CollectionUtils.isEmpty(record.getFlowParams())) { - Integer flowType = (Integer)record.getFlowParams().get("businessType"); - if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){ - updatePropertyContractStatus(record.getId()); - }else{ + if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + updatePropertyContractStatus(record.getId()); + }else{ + if(!CollectionUtils.isEmpty(record.getFlowParams())) { record.getFlowParams().put("businessId", record.getId().toString()); wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); @@ -344,7 +343,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService updateRentContract.setId(record.getId()); updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxPropertyContractMapper.updateStatus(updateRentContract); - logger.info("id:{},启动审批流成功",record.getId().toString()); + logger.info("id:{},启动审批流成功", record.getId().toString()); } } return new ResultData(Result.SUCCESS, message, record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 436066ff9..0a4ffe4d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -355,23 +355,22 @@ public class WxRentContractServiceImpl implements WxRentContractService { } // 启动审批流 - if(record.getFlowParams() != null){ - Integer flowType = (Integer)record.getFlowParams().get("businessType"); - if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){ - updateRentContractStatus(record.getId()); - }else{ - record.getFlowParams().put("businessId",record.getId().toString()); - if(record.getMerchantId() != null) { + if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + updateRentContractStatus(record.getId()); + }else{ + if(record.getFlowParams() != null) { + record.getFlowParams().put("businessId", record.getId().toString()); + if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); // 合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxRentContractMapper.updateStatus(updateRentContract); - logger.info("id:{},启动审批流成功, 是否补录:{}",record.getId().toString(),record.getMerchantId() != null); + logger.info("id:{},启动审批流成功, 是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } } @@ -412,23 +411,22 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //启动审批流 - if(record.getFlowParams() != null){ - Integer flowType = (Integer)record.getFlowParams().get("businessType"); - if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId()) == null){ - updateRentContractStatus(record.getId()); - }else{ - record.getFlowParams().put("businessId",record.getId().toString()); - if(record.getMerchantId() != null) { + if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + updateRentContractStatus(record.getId()); + }else{ + if(record.getFlowParams() != null) { + record.getFlowParams().put("businessId", record.getId().toString()); + if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); //合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxRentContractMapper.updateStatus(updateRentContract); - logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null); + logger.info("id:{},启动审批流成功 ,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } } @@ -1299,25 +1297,24 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (resultData.code != Result.SUCCESS) { return resultData; } - // 启动审批流 - if(record.getFlowParams() != null){ - //判断是否配置模板 - Integer flowType = (Integer)record.getFlowParams().get("businessType"); - if(wxFlowService.getModelByType(flowType.intValue(),record.getTenantId())==null){ - updateRentContractStatus(record.getId()); - }else{ - record.getFlowParams().put("businessId",record.getId().toString()); - if(record.getMerchantId() != null) { + //启动审批流 + //判断是否配置模板 + if(record.getFlowParams()==null || wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + updateRentContractStatus(record.getId()); + }else{ + if(record.getFlowParams() != null) { + record.getFlowParams().put("businessId", record.getId().toString()); + if (record.getMerchantId() != null) { record.getFlowParams().put("supplement", true); //设置补录 } - wxFlowService.start(record.getFlowParams(),userId,userName,record.getTenantId()); + wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); // 合同状态改成待签约 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); wxRentContractMapper.updateStatus(updateRentContract); - logger.info("id:{},启动审批流成功,是否补录:{}",record.getId().toString(),record.getMerchantId() != null); + logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } } return resultData; From 334a07d99ac37ba92fb494edb08f31f6db16bafd Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:04:24 +0800 Subject: [PATCH 178/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallUserInfoController.java | 18 ------------------ .../com/iformall/domain/po/MallUserInfo.java | 3 --- .../service/impl/MallUserInfoServiceImpl.java | 3 --- .../resources/mapper/MallUserInfoMapper.xml | 5 ----- 4 files changed, 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index e4ccda9e2..6cf41b2db 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -193,7 +193,6 @@ public class MallUserInfoController extends BaseController { currentUser.getId().equals(userInfo.getId())) { // 超管 MallUserInfo adminUser = new MallUserInfo(); - adminUser.setFlowPermission(userInfo.getFlowPermission()); adminUser.setEmail(userInfo.getEmail()); adminUser.setId(userInfo.getId()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { @@ -376,22 +375,5 @@ public class MallUserInfoController extends BaseController { } } - @ApiOperation(value = "审批权限用户列表", response = String.class) - @GetMapping("getFlowPermissionList") - //@RequiresPermissions("sys:user:flowlist") - @SystemControllerLog(description = "用户管理-审批权限用户列表") - public ResultData getFlowPermissionList() { - logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList"); - MallUserInfo mallUserInfo = new MallUserInfo(); - mallUserInfo.setFlowPermission(EnumFlowPermissionType.CONTRACT.getCode()+""); - List contractUserList = userInfoService.findList(mallUserInfo); - - mallUserInfo.setFlowPermission(EnumFlowPermissionType.BILL.getCode()+""); - List billUserList = userInfoService.findList(mallUserInfo); - Map resultMap = new HashedMap(); - resultMap.put("contractUserList",contractUserList); - resultMap.put("billUserList",billUserList); - return new ResultData(resultMap); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 1b35af1e6..3cd24b97c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -90,9 +90,6 @@ public class MallUserInfo extends BaseEntity { @Transient private String captcha; - @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") - private String flowPermission; - @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") private String email; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 8a6b2908e..89d122ef9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -131,9 +131,6 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public void saveOrUpdate(MallUserInfo record) { - if(StringUtils.isBlank(record.getFlowPermission())){ - record.setFlowPermission("[]"); - } if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index d5b152542..975c901c4 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -15,7 +15,6 @@ - @@ -78,9 +77,6 @@ and `web_open_id` = #{webOpenId} - - and JSON_CONTAINS(flow_permission->'$[*]', #{flowPermission}, '$') - and `email` = #{email} @@ -270,7 +266,6 @@ - From abfe89bae1c636f253b1be1dcdbc6e044241ec7d Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:06:55 +0800 Subject: [PATCH 179/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201906141500__L_ALTER_FLOW.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906141500__L_ALTER_FLOW.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906141500__L_ALTER_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201906141500__L_ALTER_FLOW.sql new file mode 100644 index 000000000..03758dbfd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906141500__L_ALTER_FLOW.sql @@ -0,0 +1 @@ +alter table mall_user_info drop column flow_permission; \ No newline at end of file From c9c687e94c8680d8044bf30bb83f22c2da6464e5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:28:26 +0800 Subject: [PATCH 180/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/enums/EnumTaskType.java | 2 +- .../com/iformall/service/impl/WxFlowServiceImpl.java | 10 ++++++---- .../src/main/resources/mapper/MallUserInfoMapper.xml | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java index a04fa5f12..4fed51a3a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java @@ -6,7 +6,7 @@ package com.iformall.enums; public enum EnumTaskType { - NORMAL(1, "正常"), + NORMAL(1, "普通"), AND(2, "会签"), OR(3,"或签"), ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 054247257..1368e80f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -86,8 +86,6 @@ public class WxFlowServiceImpl implements WxFlowService { @Autowired private MqBaseProducer mqBaseProducer; @Autowired - private WxBillActionService wxBillActionService; - @Autowired private WxBillPropertyDepositMapper wxBillPropertyDepositMapper; @Autowired private WxBillDepositMapper wxBillDepositMapper; @@ -1201,10 +1199,10 @@ public class WxFlowServiceImpl implements WxFlowService { } } + //部署 BpmnModel bpmnModel = new BpmnModel(); bpmnModel.addProcess(process); DeploymentBuilder deploymentBuilder = repositoryService.createDeployment().addBpmnModel(process.getId()+".bpmn20.xml", bpmnModel); - //部署 deploymentBuilder.deploy(); wxFlowModel.setFlowId(process.getId()); @@ -1220,6 +1218,11 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(); } + /** + * 创建连接线 + * @param size + * @return + */ public List createFlow(int size){ List result = new ArrayList<>(); for (int i = 0; i < size+1; i++) { @@ -1278,7 +1281,6 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + "使用该模板的审批类型。"); } - wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 975c901c4..a4aca973c 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -275,12 +275,12 @@ - u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, + u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email - u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, + u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`, u.`bopen_id`,u.`web_open_id`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email From e1d9735b98e8140b326add1bbdccb0222eb50736 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:29:32 +0800 Subject: [PATCH 181/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MallUserInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index a4aca973c..30d73891f 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -19,11 +19,11 @@ - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`,`web_open_id`,email + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`web_open_id`,email - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`, + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`, `bopen_id`,`web_open_id`,email From 21f279f6d8914559f65e375bde0fab0e63879441 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:31:48 +0800 Subject: [PATCH 182/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallUserInfoController.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index d2251bf36..392431618 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -190,7 +190,6 @@ public class MallUserInfoController extends BaseController { currentUser.getId().equals(userInfo.getId())) { // 超管 MallUserInfo adminUser = new MallUserInfo(); - adminUser.setFlowPermission(userInfo.getFlowPermission()); adminUser.setEmail(userInfo.getEmail()); adminUser.setId(userInfo.getId()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { @@ -386,22 +385,5 @@ public class MallUserInfoController extends BaseController { } } - @ApiOperation(value = "审批权限用户列表", response = String.class) - @GetMapping("getFlowPermissionList") - //@RequiresPermissions("sys:user:flowlist") - @SystemControllerLog(description = "用户管理-审批权限用户列表") - public ResultData getFlowPermissionList() { - logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList"); - MallUserInfo mallUserInfo = new MallUserInfo(); - mallUserInfo.setFlowPermission(EnumFlowPermissionType.CONTRACT.getCode()+""); - List contractUserList = userInfoService.findList(mallUserInfo); - - mallUserInfo.setFlowPermission(EnumFlowPermissionType.BILL.getCode()+""); - List billUserList = userInfoService.findList(mallUserInfo); - Map resultMap = new HashedMap(); - resultMap.put("contractUserList",contractUserList); - resultMap.put("billUserList",billUserList); - return new ResultData(resultMap); - } } From 0d706b553cc12de163f9f1ebb52fa263211af6d4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 16:06:40 +0800 Subject: [PATCH 183/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E7=BB=88=E6=AD=A2=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxRentContractController.java | 7 ++++++ .../iformall/domain/po/WxRentContract.java | 4 ++++ .../service/WxRentContractService.java | 1 + .../impl/WxRentContractServiceImpl.java | 23 ++++++++++++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 16fee5c3b..d73b870ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -300,6 +300,13 @@ public class WxRentContractController extends BaseController { return wxRentContractService.hasContractNumber(wxRentContract); } + @PostMapping("endContract") + @SystemControllerLog(description = "租赁合同-终止合同") + public ResultData endContract(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); + wxRentContractService.endContract(wxRentContract); + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 53e619c38..ea33ca1b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -87,6 +87,10 @@ public class WxRentContract extends BaseEntity { @SortColumn(column = "latePayPrice") private Integer latePayPrice; + @io.swagger.annotations.ApiModelProperty(value = "是否同时终止物业", name = "endProperty") + @Transient + private Integer endProperty; + @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index f60e9c1f1..7fdc39456 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -88,4 +88,5 @@ public interface WxRentContractService { Integer getShopType(WxRentContract wxRentContract); + void endContract(WxRentContract wxRentContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0a4ffe4d2..72613ad53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -103,7 +103,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxFlowRecordMapper wxFlowRecordMapper; @Autowired - WxPropertyContractService wxPropertyContractService; + WxBillPropertyMapper wxBillPropertyMapper; @Override public Map listAsPage(WxRentContract record, Integer pageIndex, Integer pageSize) { @@ -2017,6 +2017,27 @@ public class WxRentContractServiceImpl implements WxRentContractService { } return list; } + + @Override + public void endContract(WxRentContract wxRentContract) { + //终止租赁合同,同时终止物业合同 + if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().equals(wxRentContract.getEndProperty())){ + WxPropertyContract wxPropertyContract = new WxPropertyContract(); + wxPropertyContract.setRentContractId(wxRentContract.getId()); + wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); + wxPropertyContractMapper.updateStatusByRentContractId(wxPropertyContract); + + //物业账单失效 + wxBillPropertyMapper.updateInvalidStatusByRent(wxRentContract); + } + //租赁账单失效 + WxBillRent wxBillRent = new WxBillRent(); + wxBillRent.setRentContractId(wxRentContract.getId()); + wxBillRentMapper.updateInvalidStatus(wxBillRent); + + //解绑商户和商铺关系 + wxMerchantService.disable(wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()).getMerchantId()); + } } From 34ea23533d75b953be4eab9bdb67e5801d0c6394 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:00:33 +0800 Subject: [PATCH 184/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E9=80=9A=E8=BF=87=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 2 ++ .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 53663c9ef..2e49c0c59 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -96,6 +96,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxBillPropertyMapper.updateBills".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxActivityJoinMapper.updateSendMsg".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index e5bd4d598..6ea25b087 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -112,6 +112,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { activity.setSendMsg(EnumSendMsg.YES.getCode()); activity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(activity); + wxActivityJoin.setSendMsg(EnumSendMsg.NO.getCode()); List joinList = wxActivityJoinMapper.select(wxActivityJoin); for (WxActivityJoin join : joinList) { sendMessage(join, activity); From 456a017604bfdc87967dbdee3a2270cfe6287b5e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:03:20 +0800 Subject: [PATCH 185/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=8F=91=E9=80=81=E7=9F=AD=E6=81=AF=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=8F=AA=E5=8F=91=E4=B8=80=E6=AC=A1=E5=AD=98=E7=96=91?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E7=A1=AE=E5=AE=9A=E5=90=8E=E5=9C=A8?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 6ea25b087..ff0838728 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -113,6 +113,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { activity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(activity); wxActivityJoin.setSendMsg(EnumSendMsg.NO.getCode()); + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); List joinList = wxActivityJoinMapper.select(wxActivityJoin); for (WxActivityJoin join : joinList) { sendMessage(join, activity); From 64e0e728c539b8191e2f7035c9ddd1ce5a05e2a7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:06:12 +0800 Subject: [PATCH 186/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=80=9A=E8=BF=87=E6=8F=90=E7=A4=BA=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E9=99=90=E5=88=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index ff0838728..7247a8eb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -72,6 +72,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivityJoin params = new WxActivityJoin(); params.setTenantId(wxActivity.getTenantId()); params.setActivityId(wxActivity.getId()); + params.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); int count = wxActivityJoinMapper.selectCount(params); if (personLimit.equals(count)) { return new ResultData(ErrorCode.ACTIVITY_PERSON_LIMITED, count); From f15e8d938811af1564a6065da527e7064b63158d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:10:52 +0800 Subject: [PATCH 187/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E9=80=9A=E8=BF=87=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxActivityJoinServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 7247a8eb2..95959d4ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -109,13 +109,18 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Override public ResultData sendMsg(WxActivityJoin wxActivityJoin) { + wxActivityJoin.setSendMsg(EnumSendMsg.NO.getCode()); + wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); + List joinList = wxActivityJoinMapper.select(wxActivityJoin); + if (joinList.size() == 0) { + return new ResultData(); + } + //更改状态 WxActivity activity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); activity.setSendMsg(EnumSendMsg.YES.getCode()); activity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(activity); - wxActivityJoin.setSendMsg(EnumSendMsg.NO.getCode()); - wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode()); - List joinList = wxActivityJoinMapper.select(wxActivityJoin); + //发短信 for (WxActivityJoin join : joinList) { sendMessage(join, activity); } @@ -123,6 +128,8 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { param.put("sendMsg", EnumSendMsg.YES.getCode()); param.put("joinList", joinList); wxActivityJoinMapper.updateSendMsg(param); + + return new ResultData(); } From 3d8f148585edd8261380981075606b5f19e43f65 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:16:41 +0800 Subject: [PATCH 188/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95=E4=B8=8B?= =?UTF-8?q?=E5=BD=93=E6=B2=A1=E6=9C=89=E9=80=9A=E8=BF=87=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=97=B6=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 95959d4ba..67239cb23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -128,8 +128,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { param.put("sendMsg", EnumSendMsg.YES.getCode()); param.put("joinList", joinList); wxActivityJoinMapper.updateSendMsg(param); - - return new ResultData(); } From 61e00fbc30011b73246b4edaee0a632be2548cf2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:29:11 +0800 Subject: [PATCH 189/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D-?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=99=90=E5=88=B6=E4=B8=80=E6=9D=A1=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=AA=E8=83=BD=E6=8A=95=E6=94=BE=E5=88=B0=E5=AE=A3?= =?UTF-8?q?=E4=BC=A0=E9=A1=B5=E4=B8=80=E6=AC=A1=EF=BC=8C=E4=B8=8D=E7=84=B6?= =?UTF-8?q?=E5=9C=A8=E7=82=B9=E5=87=BB=E4=B8=8B=E7=BA=BF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index d51eeba87..d0e9e79d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -153,7 +153,12 @@ public class WxActivityServiceImpl implements WxActivityService { wxActivity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(wxActivity); //添加到宣传页 - WxCampaign campaign = new WxCampaign(); + WxCampaign campaignQuery = new WxCampaign(); + campaignQuery.setProduceId(id); + WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery); + if (campaign == null) { + campaign = new WxCampaign(); + } campaign.setCoverImg(wxActivity.getCoverImg()); campaign.setTenantId(wxActivity.getTenantId()); campaign.setTitle(wxActivity.getTitle()); @@ -168,6 +173,7 @@ public class WxActivityServiceImpl implements WxActivityService { campaign.setPagePath(wxActivity.getWeappPath()); campaign.setPageScene(wxActivity.getWeappSceneForJoin()); return wxCampaignService.addForPath(campaign); + } @Override From 62678caf87b69efc0fa847a770eed3390337e5ec Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 16:36:52 +0800 Subject: [PATCH 190/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E7=BB=88=E6=AD=A2=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 21 +++---------------- .../impl/WxRentContractServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 1368e80f8..111ea1364 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -167,29 +167,14 @@ public class WxFlowServiceImpl implements WxFlowService { rent.setId(businessId); rent.setApplyStatus(applyStatus); rent.setBusinessType(flowType); - //合同状态改成提前终止 + if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { rent.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); //终止租赁合同,同时终止物业合同 Integer endProperty = (Integer)getVariableByKey(variables,"endProperty"); - if(endProperty!=null && EnumEndProperty.END_RENT_AND_PROPERTY.getCode().intValue() == endProperty.intValue()){ - WxPropertyContract wxPropertyContract = new WxPropertyContract(); - wxPropertyContract.setRentContractId(businessId); - wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); - wxPropertyContractMapper.updateStatusByRentContractId(wxPropertyContract); - - //物业账单失效 - wxBillPropertyMapper.updateInvalidStatusByRent(rent); - } - //租赁账单失效 - WxBillRent wxBillRent = new WxBillRent(); - wxBillRent.setRentContractId(businessId); - wxBillRentMapper.updateInvalidStatus(wxBillRent); - - wxRentContractService.updateApplyStatus(rent); - //解绑商户和商铺关系 - wxMerchantService.disable(wxRentContractMapper.selectByPrimaryKey(businessId).getMerchantId()); + rent.setEndProperty(endProperty); + wxRentContractService.endContract(rent); } wxRentContractService.updateApplyStatus(rent); }else if(contractType.intValue() == 3 || contractType.intValue() == 4){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 72613ad53..62b9e4864 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2020,6 +2020,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public void endContract(WxRentContract wxRentContract) { + wxRentContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); + wxRentContractMapper.updateStatus(wxRentContract); + //终止租赁合同,同时终止物业合同 if(EnumEndProperty.END_RENT_AND_PROPERTY.getCode().equals(wxRentContract.getEndProperty())){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); From 92f7d19449b1850b87b6d6eb2c6467d01d74ca6a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:42:02 +0800 Subject: [PATCH 191/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1435.1904=EF=BC=9A=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E4=B8=8B=E8=BF=9B=E8=A1=8C=E4=B8=8B=E7=BA=BF=E7=9A=84=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BD=86=E6=98=AF=E5=AE=A3=E4=BC=A0=E9=A1=B5=E4=B8=8A?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8C=E4=B8=8B=E7=BA=BF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxActivityServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index d0e9e79d1..b6cf7cc53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -110,9 +110,7 @@ public class WxActivityServiceImpl implements WxActivityService { wxActivityMapper.updateByPrimaryKeySelective(wxActivity); if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { WxCampaign campaign = new WxCampaign(); - campaign.setType(EnumCampaignType.PAGEPATH.getCode()); campaign.setProduceId(wxActivity.getId()); - campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); WxCampaign wxCampaign = wxCampaignMapper.selectOne(campaign); campaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); From 5cea0c685648008d427e8257c6340ff643f54b25 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 16:50:53 +0800 Subject: [PATCH 192/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E7=BB=88=E6=AD=A2=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 8 ++++++++ .../com/iformall/service/WxPropertyContractService.java | 3 ++- .../com/iformall/service/impl/WxFlowServiceImpl.java | 4 +--- .../service/impl/WxPropertyContractServiceImpl.java | 9 +++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index f48e43427..a005bf9d8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumRentStartType; import com.iformall.mapper.WxPropertyContractMapper; @@ -172,5 +173,12 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.updatePropertyContractStatus(id); } + @PostMapping("endContract") + @SystemControllerLog(description = "物业合同-终止合同") + public ResultData endContract(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); + wxPropertyContractService.endContract(wxPropertyContract); + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 2dcb846d7..8fd82f850 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -5,6 +5,7 @@ import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -65,5 +66,5 @@ public interface WxPropertyContractService { ResultData updatePropertyContractStatus(Long id); - + void endContract(WxPropertyContract wxPropertyContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 111ea1364..1dd95d38a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -187,9 +187,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); //账单失效 - WxBillProperty wxBillProperty = new WxBillProperty(); - wxBillProperty.setPropertyContractId(businessId); - wxBillPropertyMapper.updateInvalidStatus(wxBillProperty); + wxPropertyContractService.endContract(wxPropertyContract); } wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index fbf0aa513..a7526afd6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -931,6 +931,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } + @Override + public void endContract(WxPropertyContract wxPropertyContract) { + wxPropertyContract.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()); + wxPropertyContractMapper.updateStatus(wxPropertyContract); + + WxBillProperty wxBillProperty = new WxBillProperty(); + wxBillProperty.setPropertyContractId(wxPropertyContract.getId()); + wxBillPropertyMapper.updateInvalidStatus(wxBillProperty); + } } From 126e69cf18efaf85714e814c6fb8f04348c10786 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 16:55:25 +0800 Subject: [PATCH 193/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][C=E7=AB=AF?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8=E4=B8=8B=E5=BD=93=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=B0=8F=E4=BA=8E?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E5=B1=9E=E4=BA=8E=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=BA=94=E8=AF=A5=E6=94=B9=E5=8F=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=9B=E5=85=A5=E5=B7=B2=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E4=B8=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/ActivitySchedule.java | 16 +++++++--------- .../iformall/mapper/WxActivityJoinMapper.java | 2 ++ .../resources/mapper/WxActivityJoinMapper.xml | 8 ++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index f25ba26ff..00ca15367 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -108,14 +109,8 @@ public class ActivitySchedule { WxActivity activity = new WxActivity(); activity.setStatus(EnumActivityStatus.STATUS_TAKE_OFFF.getCode()); wxActivityMapper.activityCompletion(activity); - } - - /** - * 5分钟一次 - */ - @Scheduled(cron = "0 */5 * * * ?") - public void campaignCompletion() { - logger.info("宣传页下架任务"); + List activityList = new ArrayList(); + //宣传页下线 WxCampaign campaign = new WxCampaign(); campaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); campaign.setType(EnumCampaignType.PAGEPATH.getCode()); @@ -123,12 +118,15 @@ public class ActivitySchedule { for (WxCampaign wxCampaign : campaignList) { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxCampaign.getProduceId()); if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { + activityList.add(wxActivity); wxCampaign.setStatus(EnumCampaignStatus.STATUS_TAKE_OFFF.getCode()); wxCampaign.setUpdateTime(new Date()); wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); } } - } + //更新报名状态 + wxActivityJoinMapper.updateStatus(activityList); + } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index ae770500e..25628e3a9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -18,4 +18,6 @@ public interface WxActivityJoinMapper extends CommonMapper void updateSendMsg(Map param); + void updateStatus(List wxActivity); + } diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index c52582920..10d984d6f 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -97,5 +97,13 @@ #{join.id} + + + update wx_activity_join set status = 3 where activity_id in + + #{activity.id} + + + From 82640dc922c00610566d5ea1e95a0d132afe256f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Jun 2019 17:13:49 +0800 Subject: [PATCH 194/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 1 + .../src/main/resources/mapper/WxRentContractMapper.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 62b9e4864..5ee154bf1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -495,6 +495,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); } wxRentContractQuery.setShopId(shopId); + wxRentContractQuery.setId(record.getId()); int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContractQuery); if (count > 0) { return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index f7428762c..3c1c1a5ed 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -252,6 +252,9 @@ select @@ -155,6 +167,20 @@ and `type` = 3 and `tenant_id` = #{tenantId} + + + + @@ -265,14 +291,6 @@ - - select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status, - rc.rent_shop_type,rc.rent_info,pc.price as property_price + rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id left join wx_shop s on rc.shop_id=s.id From c915163c12dcfccc3a058df219cc0b0ff158c062 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 15:47:30 +0800 Subject: [PATCH 230/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][C=E7=AB=AF?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B4=BB=E5=8A=A8=E4=B8=8B=E5=BD=93=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=B0=8F=E4=BA=8E?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E5=B1=9E=E4=BA=8E=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=BA=94=E8=AF=A5=E6=94=B9=E5=8F=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=9B=E5=85=A5=E5=B7=B2=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E4=B8=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/ActivitySchedule.java | 5 +++-- .../main/java/com/iformall/common/ErrorCode.java | 4 +++- .../service/impl/WxActivityServiceImpl.java | 13 +++++++++++-- .../main/resources/mapper/WxActivityJoinMapper.xml | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index 00ca15367..b9381678b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -125,8 +125,9 @@ public class ActivitySchedule { } } //更新报名状态 - wxActivityJoinMapper.updateStatus(activityList); - + if (!activityList.isEmpty()) { + wxActivityJoinMapper.updateStatus(activityList); + } } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 62417fb75..02c94b7db 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -436,7 +436,9 @@ public enum ErrorCode{ ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"), ACTIVITY_JOINED(30002, "您已报名该活动"), - ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束") + ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束"), + ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"), + ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index 619faff6f..e3113ac3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -94,6 +94,9 @@ public class WxActivityServiceImpl implements WxActivityService { if (wxActivity.getEndTime().before(new Date())) { throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); } + if (wxActivity.getEndTime().after(wxActivity.getActivityEndTime())) { + throw new MallinkException(ErrorCode.ACTIVITY_TIME_ERROR); + } Date date = new Date(); wxActivity.setCreateTime(date); wxActivity.setUpdateTime(date); @@ -153,16 +156,22 @@ public class WxActivityServiceImpl implements WxActivityService { @Override public ResultData sendToCampaign(Long id) { + WxCampaign campaignQuery = new WxCampaign(); + campaignQuery.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); + int count = wxCampaignMapper.selectCount(campaignQuery); + if (count == 7) { + throw new MallinkException(ErrorCode.ACTIVITY_SEND_ERROR); + } //修改投放状态 WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); if (wxActivity.getEndTime().before(new Date())) { - return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END); + throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); } wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); wxActivity.setUpdateTime(new Date()); wxActivityMapper.updateByPrimaryKeySelective(wxActivity); //添加到宣传页 - WxCampaign campaignQuery = new WxCampaign(); + campaignQuery = new WxCampaign(); campaignQuery.setProduceId(id); WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery); if (campaign == null) { diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 10d984d6f..f20a8934e 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -100,7 +100,7 @@ update wx_activity_join set status = 3 where activity_id in - + #{activity.id} From 336c49eed55e1c67ee463239f3f6dd35bf08c773 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 16:08:41 +0800 Subject: [PATCH 231/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxActivityServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java index e3113ac3c..109cfefe6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java @@ -202,18 +202,14 @@ public class WxActivityServiceImpl implements WxActivityService { activityJoin.setActivityId(id); activityJoin.setTenantId(wxActivity.getTenantId()); //查询是否已参加报名 - int count = wxActivityJoinMapper.selectCount(activityJoin); - if (count > 0) { - return EnumActivityEnrollStatus.JOINED.getCode(); + //下线 就是 结束 + if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { + return EnumActivityEnrollStatus.END.getCode(); } //未投放 就是 未开始 if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_THROW_IN.getCode())) { return EnumActivityEnrollStatus.NOT_START.getCode(); } - //下线 就是 结束 - if (wxActivity.getStatus().equals(EnumActivityStatus.STATUS_TAKE_OFFF.getCode())) { - return EnumActivityEnrollStatus.END.getCode(); - } Date date = new Date(); if (wxActivity.getStatus().equals(EnumActivityStatus.INJECT_CAMPAIGN.getCode())) { //报名未开始 @@ -225,6 +221,10 @@ public class WxActivityServiceImpl implements WxActivityService { return EnumActivityEnrollStatus.END.getCode(); } } + int count = wxActivityJoinMapper.selectCount(activityJoin); + if (count > 0) { + return EnumActivityEnrollStatus.JOINED.getCode(); + } return EnumActivityEnrollStatus.NORMAL.getCode(); } From 1d8dd90749c73d48f6048cf8f5eb6c318c9410b1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 17:37:41 +0800 Subject: [PATCH 232/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=96=B9=E5=BC=8F=E4=B8=8E=E5=B9=B4=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E8=B0=83=E6=95=B4=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql | 3 +++ .../java/com/iformall/domain/po/WxPropertyContract.java | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql new file mode 100644 index 000000000..6f87764d3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906171731__ALTER_PROPERTY_CONTRACT.sql @@ -0,0 +1,3 @@ +alter table wx_property_contract +add column rent_input_way smallint(2) DEFAULT 1 comment '租金录入方式1合铺录入2分铺录入', +add column adjust_ratio_way smallint(2) DEFAULT 1 comment '年租金调整方式1按比例2按金额'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 94b59ec05..7b39482d3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -183,6 +183,12 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "操作类型1区分租赁物业2合并租赁物业", name = "operationType") private Integer operationType; + @io.swagger.annotations.ApiModelProperty(value = "租金录入方式1合铺录入2分铺录入", name = "rent_input_way") + private Integer rentInputWay; + + @io.swagger.annotations.ApiModelProperty(value = "年租金调整方式1按比例2按金额", name = "adjust_ratio_way") + private Integer adjustRatioWay; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") From 5f18309a8094e361ce0b97371db716fe9facc26e Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 17:38:20 +0800 Subject: [PATCH 233/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxFlowServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 2f9e0f59f..238d6db63 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -542,9 +542,15 @@ public class WxFlowServiceImpl implements WxFlowService { if(taskList.get(0).getTaskDefinitionKey().equals(assignee.getKey())){ //设置当前节点代办人信息 String userName = ""; - for (FlowUserVo userVo:assignee.getUserList()) { - userName += userVo.getName()+" "; + for (int j = 0; j < assignee.getUserList().size(); j++) { + FlowUserVo userVo = assignee.getUserList().get(j); + if(j != assignee.getUserList().size() - 1){ + userName += userVo.getName()+","; + }else{ + userName += userVo.getName()+""; + } } + WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); @@ -558,9 +564,6 @@ public class WxFlowServiceImpl implements WxFlowService { continue; } userName = ""; - for (FlowUserVo userVo:assignee.getUserList()) { - userName += userVo.getName()+" "; - } for (int j = 0; j < assignee.getUserList().size(); j++) { FlowUserVo userVo = assignee.getUserList().get(j); if(j != assignee.getUserList().size() - 1){ From 1946cc9a99fdb11b230b2fbd996eaa8b020b2af0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 18:01:45 +0800 Subject: [PATCH 234/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8D=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillPropertyMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 3851a40cb..709f73fc5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -204,7 +204,7 @@ - update wx_bill_rent + update wx_bill_property updatetime = now(),receive_pay = #{item.receivePay}, comments = #{item.comments}, From 2a6597695e9836574a2a479a708ad7dd6974a516 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 18:54:07 +0800 Subject: [PATCH 235/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E5=BE=85=E5=8A=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/WxFlowService.java | 8 -- .../service/impl/WxFlowServiceImpl.java | 87 ++++--------------- 2 files changed, 18 insertions(+), 77 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 29bb4b6c5..9bae8b461 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -70,14 +70,6 @@ public interface WxFlowService { */ ResultData setBack(Map params,Long userId,String userName); - /** - * 生成流程图 - * @param httpServletResponse - * @param businessId - * @throws Exception - */ - void genProcessDiagram(HttpServletResponse httpServletResponse, String businessId) throws Exception; - /** * 我的申请列表 * @param pageSize diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 238d6db63..dbdfebf37 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -811,8 +811,8 @@ public class WxFlowServiceImpl implements WxFlowService { if(i != taskAssigneeList.size() -1){ UserTaskVo nextTaskAssignee = taskAssigneeList.get(i+1); if(CollectionUtils.isEmpty(nextTaskAssignee.getUserList())){ - Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); - taskService.complete(task.getId()); + List task = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); + taskService.complete(task.get(0).getId()); has = false; break; } @@ -830,8 +830,8 @@ public class WxFlowServiceImpl implements WxFlowService { if(i != taskAssigneeList.size() -1){ Map nextTaskAssignee = taskAssigneeList.get(i+1); if(StringUtils.isBlank(nextTaskAssignee.get("assignee"))){ - Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); - taskService.complete(task.getId()); + List task = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); + taskService.complete(task.get(0).getId()); has = false; break; } @@ -847,8 +847,11 @@ public class WxFlowServiceImpl implements WxFlowService { String processInstanceId = (String)params.get("processInstanceId"); String remark = (String)params.get("remark"); - Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); - Map mapInfo = taskService.getVariables(task.getId()); + List taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); + if (CollectionUtils.isEmpty(taskList)) { + return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); + } + Map mapInfo = taskService.getVariables(taskList.get(0).getId()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); Map userMap = (Map)mapInfo.get("starter"); @@ -858,11 +861,9 @@ public class WxFlowServiceImpl implements WxFlowService { String taskName; String taskKey; - if (task == null) { - return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); - } - taskName = task.getName(); - taskKey = task.getTaskDefinitionKey(); + + taskName = taskList.get(0).getName(); + taskKey = taskList.get(0).getTaskDefinitionKey(); runtimeService.deleteProcessInstance(processInstanceId, "驳回"); @@ -873,7 +874,7 @@ public class WxFlowServiceImpl implements WxFlowService { //保存wx_flow_record表审批记录 WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setBusinessId(businessId); - wxFlowRecord.setTaskId(task.getId()); + wxFlowRecord.setTaskId(taskList.get(0).getId()); wxFlowRecord.setProcessInstanceId(processInstanceId); wxFlowRecord.setRemark(remark); wxFlowRecord.setUserId(userId); @@ -953,8 +954,8 @@ public class WxFlowServiceImpl implements WxFlowService { String processInstanceId = (String)params.get("processInstanceId"); String remark = (String)params.get("remark"); - Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult(); - Map mapInfo = taskService.getVariables(task.getId()); + List task = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); + Map mapInfo = taskService.getVariables(task.get(0).getId()); Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); List> variables = (List)mapInfo.get("variables"); @@ -965,8 +966,8 @@ public class WxFlowServiceImpl implements WxFlowService { if (task == null) { return new ResultData(ErrorCode.FLOW_INST_NOT_EXIST.getCode(), "任务不存在"); } - taskName = task.getName(); - taskKey = task.getTaskDefinitionKey(); + taskName = task.get(0).getName(); + taskKey = task.get(0).getTaskDefinitionKey(); runtimeService.deleteProcessInstance(processInstanceId, "撤回"); @@ -977,7 +978,7 @@ public class WxFlowServiceImpl implements WxFlowService { //保存wx_flow_record表审批记录 WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setBusinessId(businessId); - wxFlowRecord.setTaskId(task.getId()); + wxFlowRecord.setTaskId(task.get(0).getId()); wxFlowRecord.setProcessInstanceId(processInstanceId); wxFlowRecord.setRemark(remark); wxFlowRecord.setUserId(userId); @@ -1068,58 +1069,6 @@ public class WxFlowServiceImpl implements WxFlowService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFlowRecordMapper.myHandelList(record)); } - @Override - public void genProcessDiagram(HttpServletResponse httpServletResponse,String businessId) throws Exception { - List result = wxFlowRecordService.findList(new WxFlowRecord(Long.parseLong(businessId))); - if(CollectionUtils.isNotEmpty(result)) { - String processInstanceId = result.get(0).getProcessInstanceId(); - ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); - - //流程走完的不显示图 - if (pi == null) { - return; - } - Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult(); - //使用流程实例ID,查询正在执行的执行对象表,返回流程实例对象 - String InstanceId = task.getProcessInstanceId(); - List executions = runtimeService - .createExecutionQuery() - .processInstanceId(InstanceId) - .list(); - - //得到正在执行的Activity的Id - List activityIds = new ArrayList<>(); - List flows = new ArrayList<>(); - for (Execution exe : executions) { - List ids = runtimeService.getActiveActivityIds(exe.getId()); - activityIds.addAll(ids); - } - - //获取流程图 - BpmnModel bpmnModel = repositoryService.getBpmnModel(pi.getProcessDefinitionId()); - ProcessEngineConfiguration engconf = processEngine.getProcessEngineConfiguration(); - ProcessDiagramGenerator diagramGenerator = engconf.getProcessDiagramGenerator(); - InputStream in = diagramGenerator.generateDiagram(bpmnModel, "png", activityIds, flows, engconf.getActivityFontName(), engconf.getLabelFontName(), engconf.getAnnotationFontName(), engconf.getClassLoader(), 1.0,true); - OutputStream out = null; - byte[] buf = new byte[1024]; - int legth = 0; - try { - out = httpServletResponse.getOutputStream(); - while ((legth = in.read(buf)) != -1) { - out.write(buf, 0, legth); - } - } finally { - if (in != null) { - in.close(); - } - if (out != null) { - out.close(); - } - } - }else{ - throw new MallinkException(Result.ERROR, "找不到审批历史"); - } - } public static Object getVariableByKey(List> variables,String key){ if(variables == null) return null; From d2c9c6b93598389b7eccdd02742b370861d657b1 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 17 Jun 2019 19:06:51 +0800 Subject: [PATCH 236/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E5=88=A0=E9=99=A4?= =?UTF-8?q?]:=E5=88=9B=E5=BB=BA=E7=94=B5=E8=A1=A8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906031730__ADD_BOX_METER_TABLE.sql | 95 ------------------- 1 file changed, 95 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql deleted file mode 100644 index ce70d2025..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V201906031730__ADD_BOX_METER_TABLE.sql +++ /dev/null @@ -1,95 +0,0 @@ -drop table if exists `kw_box`; -CREATE TABLE IF NOT EXISTS `kw_box` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号', - `iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号', - `place` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '位置', - `fw_version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '固件版本号', - `hd_version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '硬件版本号', - `status` smallint(2) NOT NULL COMMENT '注册状态0出厂已注册1', - `online` smallint(2) NOT NULL COMMENT '在线状态1在线0离线', - `register_time` datetime NOT NULL COMMENT '注册时间', - `last_online_time` datetime NOT NULL COMMENT '最后一次在线时间', - `config` json DEFAULT NULL COMMENT '配置', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盒子表' CHECKSUM=0 DELAY_KEY_WRITE=0; - -drop table if exists `kw_meters`; -CREATE TABLE IF NOT EXISTS `kw_meters` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '电表编号', - `brand` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '品牌', - `model` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '型号', - `place` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '位置', - `protocol` smallint(2) DEFAULT 0 COMMENT '协议(0,97协议)(1,07协议)', - `bandrate` int(5) DEFAULT 1200 COMMENT '波特率1200,2400,9600', - `online` smallint(2) NOT NULL COMMENT '在线状态1在线0离线', - `config` json DEFAULT NULL COMMENT '配置', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='电表表' CHECKSUM=0 DELAY_KEY_WRITE=0; - - -drop table if exists `kw_merchant_meter`; -CREATE TABLE IF NOT EXISTS `kw_merchant_meter` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `meter_id` bigint(20) NOT NULL COMMENT '电表ID', - `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', - `status` smallint(2) NOT NULL COMMENT '状态1历史0在用', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='商户电表关联表' CHECKSUM=0 DELAY_KEY_WRITE=0; - -drop table if exists `kw_box_meter`; -CREATE TABLE IF NOT EXISTS `kw_box_meter` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `meter_id` bigint(20) NOT NULL COMMENT '电表ID', - `box_id` bigint(20) NOT NULL COMMENT '盒子ID', - `status` smallint(2) NOT NULL COMMENT '状态1历史0在用', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='盒子电表关联表' CHECKSUM=0 DELAY_KEY_WRITE=0; - -drop table if exists `kw_box_cmd_history`; -CREATE TABLE IF NOT EXISTS `kw_box_cmd_history` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号', - `iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号', - `cmd` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '命令类型', - `info` json DEFAULT NULL COMMENT '信息', - `device_time` datetime NOT NULL COMMENT '设备命令上传记录时间', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='命令历史表' CHECKSUM=0 DELAY_KEY_WRITE=0; - -drop table if exists `kw_meter_data`; -CREATE TABLE IF NOT EXISTS `kw_meter_data` ( - `id` bigint(20) NOT NULL COMMENT '主键ID', - `tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', - `meter_id` bigint(20) NOT NULL COMMENT '电表ID', - `box_id` bigint(20) NOT NULL COMMENT '盒子ID', - `address` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '电表编号', - `result` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '度数', - `device_time` datetime NOT NULL COMMENT '设备命令上传记录时间', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`), - INDEX `id_index` USING BTREE (`id`) comment '' -) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='电表数据表' CHECKSUM=0 DELAY_KEY_WRITE=0; - From b93363f15b39ccd821a7a431bde566a363d70b1c Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 19:13:27 +0800 Subject: [PATCH 237/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E5=BE=85=E5=8A=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/workflow/WxFlowAbleController.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 4accaebe3..eceab6c9a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -183,19 +183,6 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.setBack(params,user.getId(),user.getName()); } - /** - * 生成流程图 - * - */ - @GetMapping(value = "processDiagram") - @ApiImplicitParams({ - @ApiImplicitParam(name = "businessId", value = "业务id", dataType = "String", paramType = "query", required = true) - }) - @SystemControllerLog(description = "工作流-生成流程图") - public void genProcessDiagram(HttpServletResponse httpServletResponse, String businessId) throws Exception { - wxFlowService.genProcessDiagram(httpServletResponse,businessId); - } - /** * 创建模板 From 2596143d6e0c5bf50374cf42fa787ab47120f2bc Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 17 Jun 2019 19:35:19 +0800 Subject: [PATCH 238/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxFlowServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index dbdfebf37..7722fe192 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1108,7 +1108,7 @@ public class WxFlowServiceImpl implements WxFlowService { userTask.setCandidateUsers(userIdList); if (EnumTaskType.AND.getCode().equals(taskVo.getType())) { MultiInstanceLoopCharacteristics mi = new MultiInstanceLoopCharacteristics(); - mi.setLoopCardinality(userIdList.size()+""); + mi.setLoopCardinality("1"); userTask.setLoopCharacteristics(mi); } From 7dadf0531292203315e85b75200828410ebe4f13 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 19:38:35 +0800 Subject: [PATCH 239/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=B9=B4=E7=A7=9F=E9=87=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=AF=94=E4=BE=8B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 19 +++++++++++++++---- .../impl/WxRentContractServiceImpl.java | 9 +-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 37405981d..2b26df92b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -447,16 +447,27 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService shopInfo.put(rentInfoObject.getString("shopNumber"), rentInfoObject.get("buildArea")); } } + List integers = JSONArray.parseArray(adjustRatio, Integer.class); integers.add(0, 0); int size = integers.size(); long[] priceArr = new long[size]; priceArr[0] = price; - double priceD = price; - for (int i = 1; i < size; i++) { - priceD = priceD + priceD * integers.get(i) / 10000.0; - priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); + //判断年租金调整方式 + if (wxPropertyContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.RATIO.getCode())) { + double priceD = price; + for (int i = 1; i < size; i++) { + priceD = priceD + priceD * integers.get(i) / 10000.0; + priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); + } + } else { + long priceD = price; + for (int i = 1; i < size; i++) { + priceD = priceD + integers.get(i); + priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); + } } + int month = 12; int divide = lease / month; int mod = lease % month; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0901ef87b..91e34315c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -833,7 +833,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { long[] priceArrs = null; List> shopInfos = new ArrayList<>(); if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) && - wxRentContract.getRentInputWay().equals(EnumRentContractRentInputWay.PART.getCode()) && !wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { String rentInfo = wxRentContract.getRentInfo(); JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); @@ -2061,10 +2060,4 @@ public class WxRentContractServiceImpl implements WxRentContractService { //解绑商户和商铺关系 wxMerchantService.disable(wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()).getMerchantId()); } -} - - - - - - +} \ No newline at end of file From a5810afbf7553b0b4c54973f65d22c905334b2b6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 20:01:11 +0800 Subject: [PATCH 240/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=90=88=E5=90=8C=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxPropertyContractServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 2b26df92b..be255f2b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -216,7 +216,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxRentContract != null) { if (wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || - wxRentContract.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { return new ResultData(ErrorCode.RENT_CONTRACT_IS_TERMINATED); } From 38c20d05909ef1376a6fa580cafd58536eac3857 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 20:21:36 +0800 Subject: [PATCH 241/289] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 54 ++++++++++++++----- .../impl/WxRentContractServiceImpl.java | 9 ++-- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index be255f2b9..17921d978 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -16,6 +16,7 @@ import com.iformall.mapper.*; import com.iformall.service.WxFlowRecordService; import com.iformall.service.WxFlowService; import com.iformall.service.WxPropertyContractService; +import com.iformall.service.WxRentContractService; import com.iformall.utils.DateUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; @@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -69,6 +71,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Autowired WxFlowRecordService wxFlowRecordService; + @Autowired + WxRentContractService wxRentContractService; + @Override public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { //Object rentContractStatusInfo = getRentContractStatusInfo(record); @@ -325,19 +330,42 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService message = "更新物业合同信息成功"; } - if (!CollectionUtils.isEmpty(record.getFlowParams())) { - if(wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ - updatePropertyContractStatus(record.getId()); - }else{ - record.getFlowParams().put("businessId", record.getId().toString()); - wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); - - // 合同状态改成待签约 - WxPropertyContract updateRentContract = new WxPropertyContract(); - updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - wxPropertyContractMapper.updateStatus(updateRentContract); - logger.info("id:{},启动审批流成功", record.getId().toString()); + if (record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { + if (!CollectionUtils.isEmpty(record.getFlowParams())) { + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null) { + updatePropertyContractStatus(record.getId()); + } else { + record.getFlowParams().put("businessId", record.getId().toString()); + wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + + // 合同状态改成待签约 + WxPropertyContract updateRentContract = new WxPropertyContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + wxPropertyContractMapper.updateStatus(updateRentContract); + logger.info("id:{},启动审批流成功", record.getId().toString()); + } + } + } else { + //有模板,启动审批流,没有,直接生产账单 + if (!CollectionUtils.isEmpty(record.getFlowParams())) { + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + && record.getMerchantId() != null) { + wxRentContractService.updateRentContractStatus(record.getId()); + } else { + record.getFlowParams().put("businessId", record.getId().toString()); + if (record.getMerchantId() != null) { + record.getFlowParams().put("supplement", true); //设置补录 + } + wxFlowService.start(record.getFlowParams(), userId, userName, record.getTenantId()); + + // 合同状态改成待签约 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); + logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 91e34315c..7a8ecdbd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -359,7 +359,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())){ - if(wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ record.getFlowParams().put("businessId", record.getId().toString()); @@ -415,7 +416,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())) { - if(wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ record.getFlowParams().put("businessId", record.getId().toString()); @@ -1304,7 +1306,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //有模板,启动审批流,没有,直接生产账单 if (!CollectionUtils.isEmpty(record.getFlowParams())) { - if(wxFlowService.getModelByType((Integer)record.getFlowParams().get("businessType"),record.getTenantId()) == null){ + if (wxFlowService.getModelByType((Integer) record.getFlowParams().get("businessType"), record.getTenantId()) == null + && record.getMerchantId() != null) { updateRentContractStatus(record.getId()); }else{ record.getFlowParams().put("businessId", record.getId().toString()); From 93dba36e9e0a166e208641101bdec3cfb5e93188 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 17 Jun 2019 20:37:12 +0800 Subject: [PATCH 242/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwBoxV1Controller.java | 16 ++++++-------- .../java/com/iformall/domain/po/KwBox.java | 15 ++++++++----- .../iformall/domain/po/KwBoxCmdHistory.java | 13 ++++++----- .../java/com/iformall/domain/po/KwMeter.java | 13 +++++++---- .../com/iformall/domain/po/KwMeterData.java | 14 +++++++----- ...Status.java => EnumBoxRegisterStatus.java} | 8 +++---- ...KwMetersMapper.java => KwMeterMapper.java} | 2 +- .../service/kw/impl/KwBoxServiceImpl.java | 3 +-- .../service/kw/impl/KwMeterServiceImpl.java | 16 +++++++------- .../mapper/KwBoxCmdHistoryMapper.xml | 5 ++--- .../src/main/resources/mapper/KwBoxMapper.xml | 22 +++++++++---------- .../resources/mapper/KwMeterDataMapper.xml | 7 +++--- .../{KwMetersMapper.xml => KwMeterMapper.xml} | 8 +++---- 13 files changed, 75 insertions(+), 67 deletions(-) rename mallinkService/src/main/java/com/iformall/enums/{EnumBoxStatus.java => EnumBoxRegisterStatus.java} (70%) rename mallinkService/src/main/java/com/iformall/mapper/{KwMetersMapper.java => KwMeterMapper.java} (72%) rename mallinkService/src/main/resources/mapper/{KwMetersMapper.xml => KwMeterMapper.xml} (90%) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 70f816f23..da4f90945 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -1,6 +1,5 @@ package com.iformall.controller.device; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -8,7 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.KwBox; import com.iformall.domain.po.KwBoxCmdHistory; -import com.iformall.enums.EnumBoxStatus; +import com.iformall.enums.EnumBoxRegisterStatus; import com.iformall.service.kw.KwBoxCmdHistoryService; import com.iformall.service.kw.KwBoxService; import io.netty.util.internal.StringUtil; @@ -41,11 +40,10 @@ public class KwBoxV1Controller extends BaseController { KwBoxCmdHistory kwBoxCmdHistory = new KwBoxCmdHistory(); kwBoxCmdHistory.setCmd(cmd); kwBoxCmdHistory.setCreateTime(new Date()); - kwBoxCmdHistory.setUpdateTime(new Date()); kwBoxCmdHistory.setDeviceTime(deviceTime); kwBoxCmdHistory.setIccid(ccid); kwBoxCmdHistory.setImei(imei); - kwBoxCmdHistory.setInfo(JSONObject.toJSON(paramMap).toString()); + kwBoxCmdHistory.setContent(JSONObject.toJSON(paramMap).toString()); kwBoxCmdHistory.setTenantId(tenantId); kwBoxCmdHistoryService.saveOrUpdate(kwBoxCmdHistory); @@ -67,7 +65,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.INIT.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.INIT.getCode())) return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); saveCmd(kwBox.getTenantId(),"regist",imei,ccid,deviceTime,paramMap); @@ -80,11 +78,11 @@ public class KwBoxV1Controller extends BaseController { record.setUpdateTime(new Date()); record.setRegisterTime(new Date()); record.setLastOnlineTime(new Date()); - record.setStatus(EnumBoxStatus.REGISTERED.getCode()); + record.setRegisterStatus(EnumBoxRegisterStatus.REGISTERED.getCode()); kwBoxService.saveOrUpdate(record); Map data = new HashMap<>(); - data.put("sysStatus",record.getStatus()); + data.put("sysStatus",record.getRegisterStatus()); if (kwBox.getComKey() != null) data.put("comKey",kwBox.getComKey()); if (kwBox.getConfig() != null) @@ -103,7 +101,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.REGISTERED.getCode())) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); saveCmd(kwBox.getTenantId(),"login",imei,ccid,deviceTime,paramMap); @@ -128,7 +126,7 @@ public class KwBoxV1Controller extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - if (!kwBox.getStatus().equals(EnumBoxStatus.REGISTERED.getCode())) + if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.REGISTERED.getCode())) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); saveCmd(kwBox.getTenantId(),"hb",imei,ccid,deviceTime,paramMap); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index fd7922e67..3682b3590 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -50,11 +50,11 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "硬件版本号", name = "hdVersion") private String hdVersion; - @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "registerStatus") + private Integer registerStatus; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") - private Integer online; + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus") + private Integer onlineStatus; @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") private String config; @@ -75,7 +75,12 @@ public class KwBox extends BaseEntity { private String comKey; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + UpdateTime_ASC("`update_time` ASC"), + UpdateTime_DESC("`update_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java index f34184f6d..113078a18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java @@ -41,11 +41,11 @@ public class KwBoxCmdHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid") private String iccid; - @io.swagger.annotations.ApiModelProperty(value = "'命令类型", name = "cmd") + @io.swagger.annotations.ApiModelProperty(value = "命令", name = "cmd") private String cmd; - @io.swagger.annotations.ApiModelProperty(value = "'信息", name = "info") - private String info; + @io.swagger.annotations.ApiModelProperty(value = "命令内容", name = "content") + private String content; @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") private Date deviceTime; @@ -53,11 +53,12 @@ public class KwBoxCmdHistory extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") - private Date updateTime; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 69c64553e..ea84c8338 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -14,7 +14,7 @@ import java.util.List; /** * @author gongbiao */ -@Table(name = "kw_meters") +@Table(name = "kw_meter") @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -53,8 +53,8 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") private Integer bandrate; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online") - private Integer online; + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online_status") + private Integer online_status; @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") private String config; @@ -72,7 +72,12 @@ public class KwMeter extends BaseEntity { private Date updateTime; public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"), + UpdateTime_ASC("`update_time` ASC"), + UpdateTime_DESC("`update_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index 39d60bcba..18ab54825 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -44,8 +44,8 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") private String address; - @io.swagger.annotations.ApiModelProperty(value = "度数", name = "result") - private String result; + @io.swagger.annotations.ApiModelProperty(value = "总用电量", name = "totalConsumption") + private String totalConsumption; @io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime") private Date deviceTime; @@ -53,11 +53,13 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; - @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") - private Date updateTime; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); + Id_ASC("`id` ASC"), + Id_DESC("`id` DESC"), + DeviceTime_ASC("`device_time` ASC"), + DeviceTime_DESC("`device_time` DESC"), + CreateTime_ASC("`create_time` ASC"), + CreateTime_DESC("`create_time` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java similarity index 70% rename from mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java index de23d59e7..b20c210c6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBoxRegisterStatus.java @@ -3,12 +3,12 @@ package com.iformall.enums; /** * Created by Stormeye on 2018/08/09. */ -public enum EnumBoxStatus { +public enum EnumBoxRegisterStatus { INIT(0, "出厂"), REGISTERED(1, "注册"); - public static EnumBoxStatus getEnum(Integer code) { - for (EnumBoxStatus value : values()) { + public static EnumBoxRegisterStatus getEnum(Integer code) { + for (EnumBoxRegisterStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -19,7 +19,7 @@ public enum EnumBoxStatus { private Integer code; private String message; - EnumBoxStatus(Integer code, String message) { + EnumBoxRegisterStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java similarity index 72% rename from mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java rename to mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java index d2214ff06..9554cf64e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMetersMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java @@ -5,7 +5,7 @@ import com.iformall.domain.po.KwMeter; import java.util.List; -public interface KwMetersMapper extends CommonMapper { +public interface KwMeterMapper extends CommonMapper { List findList(KwMeter param); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index ecb86842a..5cfd48f5d 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -97,13 +97,12 @@ public class KwBoxServiceImpl implements KwBoxService { KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setTenantId(record.getTenantId()); - kwMeterData.setUpdateTime(new Date()); kwMeterData.setAddress(addr); kwMeterData.setBoxId(record.getId()); kwMeterData.setCreateTime(new Date()); kwMeterData.setDeviceTime(deviceTime); kwMeterData.setMeterId(kwMeter.getId()); - kwMeterData.setResult(data); + kwMeterData.setTotalConsumption(data); kwMeterDataService.saveOrUpdate(kwMeterData); return kwMeterData; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index 3b48bf34c..e0e46ca22 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.KwMeter; -import com.iformall.mapper.KwMetersMapper; +import com.iformall.mapper.KwMeterMapper; import com.iformall.service.kw.KwMeterService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,16 +20,16 @@ public class KwMeterServiceImpl implements KwMeterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - KwMetersMapper kwMetersMapper; + KwMeterMapper kwMeterMapper; @Override public PageInfo listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMetersMapper.findList(record)); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findList(record)); } @Override public KwMeter getById(Long id) { - return kwMetersMapper.selectByPrimaryKey(id); + return kwMeterMapper.selectByPrimaryKey(id); } @@ -38,9 +38,9 @@ public class KwMeterServiceImpl implements KwMeterService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - kwMetersMapper.insertSelective(record); + kwMeterMapper.insertSelective(record); } else { - kwMetersMapper.updateByPrimaryKeySelective(record); + kwMeterMapper.updateByPrimaryKeySelective(record); } return new ResultData(); } @@ -48,12 +48,12 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public void deleteById(Long id) { - kwMetersMapper.deleteByPrimaryKey(id); + kwMeterMapper.deleteByPrimaryKey(id); } @Override public List findList(KwMeter record) { - return kwMetersMapper.findList(record); + return kwMeterMapper.findList(record); } diff --git a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml index 32ab96016..457f9ea29 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxCmdHistoryMapper.xml @@ -7,14 +7,13 @@ - + - - `id`,`tenant_id`,`imei`,`iccid`,`cmd`,`info`,`device_time`,`create_time`,`update_time` + `id`,`tenant_id`,`imei`,`iccid`,`content`,`info`,`device_time`,`create_time` diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index fb370a55e..b4f4dc85c 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -9,8 +9,8 @@ - - + + @@ -20,7 +20,7 @@ - `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`status`,`online`,`register_time`, + `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`register_status`,`online_status`,`register_time`, `last_online_time`,`config`,`create_time`,`update_time`,`com_key` @@ -35,24 +35,24 @@ and `tenant_id` = #{tenantId} - - and `imei` like concat('%', #{imei},'%') + + and `imei` = #{imei} - - and `iccid` like concat('%', #{iccid},'%') + + and `iccid` = #{iccid} and `place` like concat('%', #{place},'%') - - and `status` = #{status} + + and `register_status` = #{registerStatus} - - and `online` = #{online} + + and `online_status` = #{onlineStatus} diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 4939304a2..8f7443cc6 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -7,14 +7,13 @@ - + - - `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`result`,`device_time`,`create_time`,`update_time` + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_consumption`,`device_time`,`create_time` @@ -40,7 +39,7 @@ diff --git a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml similarity index 90% rename from mallinkService/src/main/resources/mapper/KwMetersMapper.xml rename to mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 125016fba..a9219c26c 100644 --- a/mallinkService/src/main/resources/mapper/KwMetersMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -1,6 +1,6 @@ - + @@ -10,14 +10,14 @@ - + - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online`,`config`,`create_time`,`update_time` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online_status`,`config`,`create_time`,`update_time` @@ -63,7 +63,7 @@ From de431df93e90682cbd9282ff90d8e83bef2a6427 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 17 Jun 2019 20:54:35 +0800 Subject: [PATCH 243/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E5=A2=9E=E5=8A=A0=E7=94=B5=E8=A1=A8=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/KwMeter.java | 7 ++----- .../src/main/resources/mapper/KwMeterMapper.xml | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index ea84c8338..e158a2329 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -53,15 +53,12 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") private Integer bandrate; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online_status") - private Integer online_status; + @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus") + private Integer onlineStatus; @io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config") private String config; - @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime") - private Date registerTime; - @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime") private Date lastOnlineTime; diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index a9219c26c..e8e010248 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -10,6 +10,7 @@ + @@ -17,7 +18,7 @@ - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`online_status`,`config`,`create_time`,`update_time` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`last_online_time`,`online_status`,`config`,`create_time`,`update_time` @@ -31,8 +32,8 @@ and `tenant_id` = #{tenantId} - - and `address` like concat('%', #{address},'%') + + and `address` = #{address} @@ -47,8 +48,8 @@ and `model` = #{model} - - and `online` = #{online} + + and `online_status` = #{onlineStatus} From bad5f32046a3de69758a3c360f12dbf7bc9e7deb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 10:38:54 +0800 Subject: [PATCH 244/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1465.1929=EF=BC=9A=E5=A4=9A=E7=BB=8F=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E4=B8=9A=E8=B4=A6=E5=8D=95-=E7=89=A9?= =?UTF-8?q?=E4=B8=9A=E5=8D=95=E4=BB=B7=E6=8F=90=E4=BA=A4=E5=A4=9A=E9=99=A4?= =?UTF-8?q?=E4=BB=A5100]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 17921d978..091d38a36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -118,7 +118,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if(rentPrice == null){ if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())&& !"0.0".equals(wxPropertyContract.getRentArea()) ) { Double rentArea = Double.parseDouble(wxPropertyContract.getRentArea()); - rentPrice = new BigDecimal((float) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + rentPrice = new BigDecimal((double) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); rentInfoObject.put("rentPrice", rentPrice); } } @@ -127,9 +127,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService }else{ if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())&& !"0.0".equals(wxPropertyContract.getRentArea()) ) { if(StringUtils.isNotBlank(wxPropertyContract.getRentArea()) && !"0".equals(wxPropertyContract.getRentArea()) && !"0.00".equals(wxPropertyContract.getRentArea())) { - Long price = wxPropertyContract.getPrice() / 100; - Double rentArea = Double.parseDouble(wxPropertyContract.getRentArea()); - Double rentPrice = new BigDecimal((float) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + Long price = wxPropertyContract.getPrice(); + Double rentArea = Double.parseDouble(wxPropertyContract.getRentArea()) * 100; + Double rentPrice = new BigDecimal((double) price / rentArea).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + rentPrice = rentPrice * 100; if (rentPrice > 0) { wxPropertyContract.setRentPrice(rentPrice.toString()); } else { From 2f40f585cd04e0e15530519776544d50fad08d04 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 18 Jun 2019 10:44:12 +0800 Subject: [PATCH 245/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxBillAll.java | 1 - .../com/iformall/domain/vo/WxBillAllVo.java | 3 +++ .../resources/mapper/WxBillActionMapper.xml | 3 ++- .../main/resources/mapper/WxBillAllMapper.xml | 23 ++++++++++--------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index d71f5c698..3aab9ada5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -122,7 +122,6 @@ public class WxBillAll extends BaseEntity { - @Transient @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") private Integer filterHasPay; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index f8e680f4f..4e01afa4d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -65,6 +65,9 @@ public class WxBillAllVo { private String name; + @io.swagger.annotations.ApiModelProperty(value = "评论", name = "comments") + private String comments; + public String getReceivePayStr() { if(getReceivePay()!=null) { receivePayStr = new BigDecimal(getReceivePay()).divide(new BigDecimal(100)).toString(); diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index 85d39ce31..860f9b944 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -15,7 +15,8 @@ - `id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime` + `id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`, + diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index fec402742..b5952dcfc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -34,7 +34,8 @@ - + + @@ -47,49 +48,49 @@ ,bill.receive_date receiveDate, bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status,bill.starttime, bill.endtime,bill.name,bill.rent_shop_type rentShopType,m.name merchantName, - s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo + s.shop_number shopNumber, s.manager, s.manager_phone managerPhone,bill.shop_info shopInfo,bill.comments from ( select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info + endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments from wx_bill_rent where is_preview = 0 union select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,shop_info from wx_bill_rent_deposit + endtime,rent_shop_type,shop_info,NULL comments from wx_bill_rent_deposit union select id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info + endtime,rent_shop_type,case when shop_info is null then '[]' else shop_info end shop_info,comments from wx_bill_property where is_preview = 0 union select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,shop_info from wx_bill_property_deposit + endtime,rent_shop_type,shop_info,NULL comments from wx_bill_property_deposit union select id,merchant_id,shop_id,tenant_id,'水费' name,5 bill_type_value,'水费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info + rent_shop_type,'[]' shop_info,NULL comments from wx_bill_daily where type=1 union select id,merchant_id,shop_id,tenant_id,'电费' name,6 bill_type_value,'电费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info + rent_shop_type,'[]' shop_info,NULL comments from wx_bill_daily where type=2 union select id,merchant_id,shop_id,tenant_id,'空调费' name,9 bill_type_value,'空调费' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info + rent_shop_type,'[]' shop_info,NULL comments from wx_bill_daily where type=3 union select id,merchant_id,shop_id,tenant_id,name,7 bill_type_value,'其他' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info + rent_shop_type,'[]' shop_info,comments from wx_bill_other union select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info + rent_shop_type,'[]' shop_info,comments from wx_bill_other_deposit ) bill left join wx_merchant m on bill.merchant_id=m.id From 3db34bf71d3daa2537934cc6848ea2bfd87f2f5f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 11:46:35 +0800 Subject: [PATCH 246/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/WxPropertyContractService.java | 4 ++++ .../service/impl/WxPropertyContractServiceImpl.java | 13 +++++++++---- .../impl/WxRentPropertyContractServiceImpl.java | 4 ++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index acdb8e1a9..6e845ec8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -1,10 +1,12 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; /** @@ -64,4 +66,6 @@ public interface WxPropertyContractService { void endContract(WxPropertyContract wxPropertyContract); void updatePropertyPreviewBill(WxPropertyContract record); + + List getWxBillPropertyPreview(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 091d38a36..68fef80af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -195,13 +195,18 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } //查询预账单用于展示 + List resultList = getWxBillPropertyPreview(id); + result.put("previewBillRentList", resultList); + + return result; + } + + @Override + public List getWxBillPropertyPreview(Long id) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(id); wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); - List resultList = wxBillPropertyMapper.findList(wxBillRent); - result.put("previewBillRentList",resultList); - - return result; + return wxBillPropertyMapper.findList(wxBillRent); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 583030053..0f522e2ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -51,6 +53,8 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); + List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); + propertyContract.setPreviewBillRentList(wxBillPropertyPreview); data.put("property", propertyContract); return new ResultData(data); } From 6cb906d3a412071f5ac4d71a9adecbc826cfeb33 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 11:48:56 +0800 Subject: [PATCH 247/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentPropertyContractServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 0f522e2ff..49f94c4e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -53,9 +53,11 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); - List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); - propertyContract.setPreviewBillRentList(wxBillPropertyPreview); - data.put("property", propertyContract); + if (propertyContract != null) { + List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); + propertyContract.setPreviewBillRentList(wxBillPropertyPreview); + data.put("property", propertyContract); + } return new ResultData(data); } From 013b1e8c6b4a5941866bdec4ae0bf40aac0f5254 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 12:58:40 +0800 Subject: [PATCH 248/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E8=B0=83=E6=95=B4=E8=A1=A8=E7=BB=93=E6=9E=84,=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9B=92=E5=AD=90=E7=94=B5=E8=A1=A8=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E6=96=B9=E4=BE=BF=E5=90=8E=E7=BB=AD=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwBoxController.java | 97 +++++++++++++++ .../controller/device/KwMeterController.java | 117 ++++++++++++++++++ .../controller/device/KwBoxV1Controller.java | 4 +- .../java/com/iformall/common/ErrorCode.java | 1 + .../java/com/iformall/domain/po/KwBox.java | 9 ++ .../com/iformall/domain/po/KwBoxMeter.java | 107 ---------------- .../java/com/iformall/domain/po/KwMeter.java | 7 ++ ...BoxMeterStatus.java => EnumBoxStatus.java} | 8 +- .../com/iformall/enums/EnumMeterStatus.java | 34 +++++ .../com/iformall/mapper/KwBoxMeterMapper.java | 13 -- .../service/kw/KwBoxMeterService.java | 58 --------- .../com/iformall/service/kw/KwBoxService.java | 4 +- .../kw/impl/KwBoxMeterServiceImpl.java | 60 --------- .../service/kw/impl/KwBoxServiceImpl.java | 59 +++------ .../src/main/resources/mapper/KwBoxMapper.xml | 8 +- .../resources/mapper/KwBoxMeterMapper.xml | 50 -------- .../main/resources/mapper/KwMeterMapper.xml | 15 ++- 17 files changed, 312 insertions(+), 339 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java delete mode 100644 mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java rename mallinkService/src/main/java/com/iformall/enums/{EnumBoxMeterStatus.java => EnumBoxStatus.java} (71%) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumMeterStatus.java delete mode 100644 mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java delete mode 100644 mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java delete mode 100644 mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java delete mode 100644 mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java new file mode 100644 index 000000000..b7973a3c2 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -0,0 +1,97 @@ +package com.iformall.controller.device; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.KwBox; +import com.iformall.enums.EnumBoxStatus; +import com.iformall.service.kw.KwBoxService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("kwBox") +@Api(description="开物盒子") +public class KwBoxController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private KwBoxService kwBoxService; + + @ApiOperation("设备列表") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "开物盒子-设备列表") + public Result list(@ModelAttribute KwBox kwBox, Integer pageNum, Integer pageSize) { + if (kwBox == null) kwBox = new KwBox(); + kwBox.setTenantId(getTenantId()); + kwBox.setStatus(EnumBoxStatus.VALID.getCode()); + return new ResultData(kwBoxService.listAsPage(kwBox, pageNum,pageSize)); + } + + @ApiOperation("添加设备") + @PostMapping("add") + @SystemControllerLog(description = "开物盒子-添加设备") + public Result add(@RequestBody KwBox kwBox) { + + KwBox record = new KwBox(); + record.setImei(kwBox.getImei()); + List list = kwBoxService.findList(record); + if (list.size() > 0) + return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); + kwBox.setTenantId(getTenantId()); + kwBox.setStatus(EnumBoxStatus.VALID.getCode()); + return kwBoxService.saveOrUpdate(kwBox); + } + + @ApiOperation("更新设备") + @PostMapping("update") + @SystemControllerLog(description = "开物盒子-更新设备") + public Result update(@RequestBody KwBox kwBox) { + if (kwBox == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (kwBox.getId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + kwBox.setTenantId(getTenantId()); + return kwBoxService.saveOrUpdate(kwBox); + } + + @ApiOperation("设备详情") + @GetMapping("detail") + @SystemControllerLog(description = "开物盒子-设备详情") + public Result detail(@RequestParam Long id) { + if (id == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + KwBox kwBox = kwBoxService.getById(id); + if (kwBox == null) + return new ResultData(ErrorCode.SCREENAD_NOT_FOUND); + + kwBox.setMeters(kwBoxService.findMeters(kwBox)); + return new ResultData(kwBox); + } + + @ApiOperation("删除设备") + @PostMapping("delete") + @SystemControllerLog(description = "开物盒子-删除设备") + public Result delete(@RequestParam Long id) { + if (id == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + KwBox kwBox = new KwBox(); + kwBox.setId(id); + kwBox.setTenantId(getTenantId()); + kwBox.setStatus(EnumBoxStatus.INVALID.getCode()); + return kwBoxService.saveOrUpdate(kwBox); + } +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java new file mode 100644 index 000000000..d275625b8 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -0,0 +1,117 @@ +package com.iformall.controller.device; + +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.KwBox; +import com.iformall.domain.po.KwMeter; +import com.iformall.enums.EnumBoxStatus; +import com.iformall.service.kw.KwBoxService; +import com.iformall.service.kw.KwMeterService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("kwMeter") +@Api(description="电表设备") +public class KwMeterController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private KwMeterService kwMeterService; + + @Autowired + private KwBoxService kwBoxService; + + + @ApiOperation("设备列表") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "电表设备-设备列表") + public Result list(@ModelAttribute KwMeter kwMeter, Integer pageNum, Integer pageSize) { + if (kwMeter == null) kwMeter = new KwMeter(); + kwMeter.setTenantId(getTenantId()); + return new ResultData(kwMeterService.listAsPage(kwMeter, pageNum,pageSize)); + } + + @ApiOperation("添加设备") + @PostMapping("add") + @SystemControllerLog(description = "电表设备-添加设备") + public Result add(@RequestBody KwMeter kwMeter) { + + if (kwMeter == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (kwMeter.getBoxId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (kwMeter.getAddress() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId()); + if (kwBox == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + KwMeter record = new KwMeter(); + record.setBoxId(kwMeter.getBoxId()); + List KwMeters = kwMeterService.findList(record); + if (KwMeters.size() > kwBox.getMaxTagNum()) + return new ResultData(ErrorCode.DEVICE_REACHED_MAX_NUMBER); + + record.setBoxId(kwMeter.getBoxId()); + record.setAddress(kwMeter.getAddress()); + KwMeters = kwMeterService.findList(record); + if (KwMeters.size() > 0) + return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); + kwMeter.setTenantId(getTenantId()); + return kwMeterService.saveOrUpdate(kwMeter); + } + + @ApiOperation("更新设备") + @PostMapping("update") + @SystemControllerLog(description = "电表设备-更新设备") + public Result update(@RequestBody KwMeter kwMeter) { + if (kwMeter == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (kwMeter.getId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + kwMeter.setTenantId(getTenantId()); + return kwMeterService.saveOrUpdate(kwMeter); + } + + @ApiOperation("设备详情") + @GetMapping("detail") + @SystemControllerLog(description = "电表设备-设备详情") + public Result detail(@RequestParam Long id) { + if (id == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + KwMeter kwMeter = kwMeterService.getById(id); + if (kwMeter == null) + return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + + return new ResultData(kwMeter); + } + + @ApiOperation("删除设备") + @PostMapping("delete") + @SystemControllerLog(description = "电表设备-删除设备") + public Result delete(@RequestParam Long id) { + if (id == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + KwMeter kwMeter = new KwMeter(); + kwMeter.setId(id); + kwMeter.setTenantId(getTenantId()); + kwMeter.setStatus(EnumBoxStatus.INVALID.getCode()); + return kwMeterService.saveOrUpdate(kwMeter); + } +} diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index da4f90945..87ee7da31 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -87,7 +87,7 @@ public class KwBoxV1Controller extends BaseController { data.put("comKey",kwBox.getComKey()); if (kwBox.getConfig() != null) data.put("config",kwBox.getConfig()); - List meters = kwBoxService.findMeters(kwBox); + List meters = kwBoxService.findMetersAddress(kwBox); if (!meters.isEmpty()) data.put("meters",meters); return new ResultData(data); @@ -148,7 +148,7 @@ public class KwBoxV1Controller extends BaseController { }); } - List meters = kwBoxService.findMeters(kwBox); + List meters = kwBoxService.findMetersAddress(kwBox); boolean updateMeters = false; boolean updateConfig = false; diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 02c94b7db..9ed074ce1 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -403,6 +403,7 @@ public enum ErrorCode{ DEVICE_NOT_FOUND(26000, "设备未注册到系统"), DEVICE_ALREADY_EXIST(26001, "设备已经存在"), DEVICE_QRCODE_GET_FAILED(26002, "微信二维码生成失败,请重试"), + DEVICE_REACHED_MAX_NUMBER(26003, "设备已经达到最大数量"), /** * 消息组件 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 3682b3590..a16e3f1a0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -74,6 +74,15 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "通信密钥", name = "comKey") private String comKey; + @io.swagger.annotations.ApiModelProperty(value = "状态0有效1无效", name = "status") + private Integer status; + + @io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum") + private Integer maxTagNum; + + @Transient + private List meters; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java deleted file mode 100644 index 25a6d2623..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.iformall.domain.po; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @author gongbiao - */ -@Table(name = "kw_box_meter") -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class KwBoxMeter extends BaseEntity { - @Id - protected Long id; - @Transient - protected List ids; - @Transient - protected String sortColumns; - - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - - @io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId") - private String tenantId; - - @io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId") - private Long meterId; - - @io.swagger.annotations.ApiModelProperty(value = "盒子ID", name = "boxId") - private Long boxId; - - @io.swagger.annotations.ApiModelProperty(value = "状态1历史0在用", name = "status") - private Integer status; - - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") - private Date createTime; - - @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") - private Date updateTime; - - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(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()); - } - this.sortColumns = sb.toString(); - } - - public void setSortColumns(String sortColumns) { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - List fList = new 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/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index e158a2329..0790d9c37 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -68,6 +68,13 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "开物盒子ID", name = "boxId") + private Long boxId; + + @io.swagger.annotations.ApiModelProperty(value = "状态0有效1无效", name = "status") + private Integer status; + + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java similarity index 71% rename from mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java rename to mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java index 1104f2c2c..fff4099d0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBoxMeterStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBoxStatus.java @@ -3,12 +3,12 @@ package com.iformall.enums; /** * Created by Stormeye on 2018/08/09. */ -public enum EnumBoxMeterStatus { +public enum EnumBoxStatus { VALID(0, "有效"), INVALID(1, "无效"); - public static EnumBoxMeterStatus getEnum(Integer code) { - for (EnumBoxMeterStatus value : values()) { + public static EnumBoxStatus getEnum(Integer code) { + for (EnumBoxStatus value : values()) { if (value.getCode().equals(code)) { return value; } @@ -19,7 +19,7 @@ public enum EnumBoxMeterStatus { private Integer code; private String message; - EnumBoxMeterStatus(Integer code, String message) { + EnumBoxStatus(Integer code, String message) { this.code = code; this.message = message; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMeterStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMeterStatus.java new file mode 100644 index 000000000..ed6fc8a34 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMeterStatus.java @@ -0,0 +1,34 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMeterStatus { + + VALID(0, "有效"), + INVALID(1, "无效"); + public static EnumMeterStatus getEnum(Integer code) { + for (EnumMeterStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMeterStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java deleted file mode 100644 index e29f65513..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/KwBoxMeterMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.iformall.mapper; - -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.KwBoxMeter; - -import java.util.List; - -public interface KwBoxMeterMapper extends CommonMapper { - - List findList(KwBoxMeter param); - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java deleted file mode 100644 index aa12d0ff1..000000000 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxMeterService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.iformall.service.kw; - - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.KwBoxMeter; - -import java.util.List; - -public interface KwBoxMeterService { - - - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(KwBoxMeter record, Integer pageIndex, Integer pageSize); - - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - KwBoxMeter getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - ResultData saveOrUpdate(KwBoxMeter record); - - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - /** - * 根据实体查询分页列表 - * - * @param record - * @return - */ - List findList(KwBoxMeter record); - - -} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java index edef174b8..8ee944fae 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwBoxService.java @@ -58,8 +58,8 @@ public interface KwBoxService { */ List findList(KwBox record); - - List findMeters(KwBox record); + List findMetersAddress(KwBox record); + List findMeters(KwBox record); KwMeter findMeter(KwBox record, String addr); KwBox findByImei(String imei); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java deleted file mode 100644 index 9ada88c1c..000000000 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxMeterServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.iformall.service.kw.impl; - -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.common.IdWorker; -import com.iformall.common.ResultData; -import com.iformall.domain.po.KwBoxMeter; -import com.iformall.mapper.KwBoxMeterMapper; -import com.iformall.service.kw.KwBoxMeterService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -@Service -public class KwBoxMeterServiceImpl implements KwBoxMeterService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - KwBoxMeterMapper kwBoxMeterMapper; - - @Override - public PageInfo listAsPage(KwBoxMeter record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwBoxMeterMapper.findList(record)); - } - - @Override - public KwBoxMeter getById(Long id) { - return kwBoxMeterMapper.selectByPrimaryKey(id); - } - - - @Override - public ResultData saveOrUpdate(KwBoxMeter record) { - if (record.getId() == null) { - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - kwBoxMeterMapper.insertSelective(record); - } else { - kwBoxMeterMapper.updateByPrimaryKeySelective(record); - } - return new ResultData(); - } - - - @Override - public void deleteById(Long id) { - kwBoxMeterMapper.deleteByPrimaryKey(id); - } - - @Override - public List findList(KwBoxMeter record) { - return kwBoxMeterMapper.findList(record); - } - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 5cfd48f5d..0919f5a7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -1,19 +1,15 @@ package com.iformall.service.kw.impl; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.KwBox; -import com.iformall.domain.po.KwBoxMeter; import com.iformall.domain.po.KwMeter; import com.iformall.domain.po.KwMeterData; -import com.iformall.enums.EnumBoxMeterStatus; +import com.iformall.enums.EnumMeterStatus; import com.iformall.mapper.KwBoxMapper; -import com.iformall.service.kw.KwBoxMeterService; import com.iformall.service.kw.KwBoxService; import com.iformall.service.kw.KwMeterDataService; import com.iformall.service.kw.KwMeterService; @@ -38,9 +34,6 @@ public class KwBoxServiceImpl implements KwBoxService { @Autowired KwMeterDataService kwMeterDataService; - @Autowired - KwBoxMeterService kwBoxMeterService; - @Autowired KwMeterService kwMeterService; @@ -60,8 +53,11 @@ public class KwBoxServiceImpl implements KwBoxService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); kwBoxMapper.insertSelective(record); } else { + record.setUpdateTime(new Date()); kwBoxMapper.updateByPrimaryKeySelective(record); } return new ResultData(); @@ -109,55 +105,38 @@ public class KwBoxServiceImpl implements KwBoxService { } @Override - public List findMeters(KwBox record) { - - KwBoxMeter kwBoxMeter = new KwBoxMeter(); - kwBoxMeter.setBoxId(record.getId()); - kwBoxMeter.setStatus(EnumBoxMeterStatus.VALID.getCode()); + public List findMetersAddress(KwBox record) { - List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); - - if (kwBoxMeters.isEmpty()) { - logger.info("没找到盒子表关联项: boxId="+kwBoxMeter.getBoxId()); - return new ArrayList<>(); - } - KwMeter kwMeter = new KwMeter(); - kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); + List kwMeters = findMeters(record); - if (kwMeter.getIds().isEmpty()) { - logger.info("没找到盒子关联的表: boxId="+kwBoxMeter.getBoxId()); - return new ArrayList<>(); - } - List kwMeters = kwMeterService.findList(kwMeter); - - if (kwMeter.getIds().isEmpty()) { - logger.info("没找到盒子关联的表: ids=" + kwBoxMeter.getIds()); + if (kwMeters.isEmpty()) { + logger.info("没找到盒子关联的表: boxId=" + record.getId()); return new ArrayList<>(); } return kwMeters.stream().map(KwMeter::getAddress).collect(Collectors.toList()); } @Override - public KwMeter findMeter(KwBox record, String addr) { + public List findMeters(KwBox record) { - KwBoxMeter kwBoxMeter = new KwBoxMeter(); - kwBoxMeter.setBoxId(record.getId()); - kwBoxMeter.setStatus(EnumBoxMeterStatus.VALID.getCode()); + KwMeter kwMeter = new KwMeter(); + kwMeter.setBoxId(record.getId()); + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); - List kwBoxMeters = kwBoxMeterService.findList(kwBoxMeter); + return kwMeterService.findList(kwMeter); + } - if (kwBoxMeters.isEmpty()) { - logger.info("没找到盒子表关联项: boxId="+kwBoxMeter.getBoxId()); - return null; - } + @Override + public KwMeter findMeter(KwBox record, String addr) { KwMeter kwMeter = new KwMeter(); + kwMeter.setBoxId(record.getId()); + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); kwMeter.setAddress(addr); - kwMeter.setIds(kwBoxMeters.stream().map(KwBoxMeter::getMeterId).collect(Collectors.toList())); List kwMeters = kwMeterService.findList(kwMeter); if (kwMeters.isEmpty()) { - logger.info("没找到盒子关联的表: ids="+kwBoxMeter.getIds() +",addr=",kwMeter.getAddress()); + logger.info("没找到盒子关联的电表: id="+record.getId() +",addr=",kwMeter.getAddress()); return null; } diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index b4f4dc85c..9788737d5 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -17,11 +17,13 @@ + + `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`register_status`,`online_status`,`register_time`, - `last_online_time`,`config`,`create_time`,`update_time`,`com_key` + `last_online_time`,`config`,`create_time`,`update_time`,`com_key`,`status`,`max_tag_num` @@ -54,6 +56,10 @@ and `online_status` = #{onlineStatus} + + + and `status` = #{status} + and id in diff --git a/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml deleted file mode 100644 index 3dc46c552..000000000 --- a/mallinkService/src/main/resources/mapper/KwBoxMeterMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - `id`,`tenant_id`,`meter_id`,`box_id`,`status`,`create_time`,`update_time` - - - - where 1 = 1 - - - and `id` = #{id} - - - - and `tenant_id` = #{tenantId} - - - - and `status` = #{status} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index e8e010248..ce71211a3 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -15,10 +15,13 @@ + + + - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`last_online_time`,`online_status`,`config`,`create_time`,`update_time` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`last_online_time`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status` @@ -51,7 +54,15 @@ and `online_status` = #{onlineStatus} - + + + and `box_id` = #{boxId} + + + + and `status` = #{status} + + and id in From 7cb977795a60b76fb0b5e0a07721d0bdcea234f9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 13:50:59 +0800 Subject: [PATCH 249/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxRentContractController.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 4ac1c9514..350a54e38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -236,7 +236,7 @@ public class WxRentContractController extends BaseController { @PostMapping("updateRentContractStatus") @SystemControllerLog(description = "租赁合同-更新合同状态") - public ResultData updateRentContractStatus(@ModelAttribute WxRentContract wxRentContract) { + public ResultData updateRentContractStatus(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); return wxRentContractService.updateRentContractStatus(wxRentContract.getId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7a8ecdbd2..6be82c0ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1360,11 +1360,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit(wxMerchant, null,id); updatePropertyPreviewBill(record); - - + //作废合同 + updateInvalidContract(id); } - //作废合同 - updateInvalidContract(id); + return new ResultData(Result.SUCCESS, "操作成功"); } From fa3af3748130d783b0a318fa5a5595e9690a48cc Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 13:53:35 +0800 Subject: [PATCH 250/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 75c9c675f..7b00553d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,8 +7,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumRentStartType; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.service.WxBillPropertyService; @@ -166,12 +164,12 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.hasRentContract(rentContractId); } - @GetMapping("updatePropertyContractStatus") + @PostMapping("updatePropertyContractStatus") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "物业合同-更新合同状态") - public ResultData updatePropertyContractStatus(Long id) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - return wxPropertyContractService.updatePropertyContractStatus(id); + public ResultData updatePropertyContractStatus(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentContractStatus"); + return wxPropertyContractService.updatePropertyContractStatus(wxPropertyContract.getId()); } @PostMapping("endContract") From 40e5db7774b7932f6fd9727d8d3bcff07499231d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 14:24:45 +0800 Subject: [PATCH 251/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E4=B8=9A=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxRentPropertyContractVo.java | 5 ++++- .../src/main/resources/mapper/WxRentContractMapper.xml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index bb873c667..0c5670f19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -56,7 +56,7 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "计租类型", name = "type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "合同状态", name = "status") + @io.swagger.annotations.ApiModelProperty(value = "租赁合同状态", name = "status") private Integer status; @io.swagger.annotations.ApiModelProperty(value = "审批状态", name = "applyStatus") @@ -74,5 +74,8 @@ public class WxRentPropertyContractVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; + @io.swagger.annotations.ApiModelProperty(value = "物业合同状态", name = "propertyStatus") + private Integer propertyStatus; + } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e93d7209a..1e3a8dc61 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -316,13 +316,14 @@ + select rc.id,rc.merchant_name,rc.rental_start_date,rc.rental_end_date,rc.`status`, rc.price as rent_price,rc.contract_number,s.shop_number,rc.type,rc.apply_status, - rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status + rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status, + rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id left join wx_shop s on rc.shop_id=s.id From 01d0ac677e4a310b3397ec0555ea46286d8c2c1f Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 18 Jun 2019 17:50:00 +0800 Subject: [PATCH 259/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=BE=84=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 679359453..fba23c87d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -607,14 +607,34 @@ public class WxFlowServiceImpl implements WxFlowService { } // 设置最后一个发起节点 if(CollectionUtils.isNotEmpty(resultList)){ - for (WxFlowRecord wxFlowRecord:resultList) { - if(wxFlowRecord.getStatus() == 1){ - wxFlowRecord.setIsLastStart(1); + for (int i = 0; i < resultList.size() ; i++) { + if(resultList.get(i).getStatus() == 1){ + resultList.get(i).setIsLastStart(1); + resultList = resultList.subList(0,i+1); break; } } } - return new ResultData(resultList); + + // 合并会签节点展 + Map map = new LinkedHashMap<>(); + for (WxFlowRecord r:resultList) { + if(r.getTaskKey() == null){ + r.setTaskKey(r.getTaskName()); + } + WxFlowRecord mapR = map.get(r.getTaskKey()); + if(mapR != null) + mapR.setUserName(mapR.getUserName()+","+r.getUserName()); + else + map.put(r.getTaskKey(),r); + } + + List flowRecordList = new ArrayList<>(); + for (String key:map.keySet()) { + flowRecordList.add(map.get(key)); + } + + return new ResultData(flowRecordList); } @Override From 2aae12c9c8c2d1d65c503dd46ee23c0fcea88789 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 19:36:10 +0800 Subject: [PATCH 260/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxRentContractMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index eefc2ba40..14ad7bbb7 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -261,7 +261,7 @@ resultType="com.iformall.domain.po.WxRentContract"> select * from wx_rent_contract where tenant_id=#{tenantId} and json_contains(json_extract(rent_info,'$[*].shopId'),concat('"',${shopId},'"')) and rent_shop_type =1 - and status=#{status} + and status=#{status} and status!=7 From 1c311f70e55f2f8a868efddad6037da2ee3cee74 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 19:58:47 +0800 Subject: [PATCH 261/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=B5=E9=87=8F=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/KwMeterData.java | 6 ++ .../com/iformall/domain/vo/KwMeterDataVo.java | 6 +- .../service/kw/KwMeterDataService.java | 4 + .../service/kw/impl/KwBoxServiceImpl.java | 23 +++++- .../kw/impl/KwMeterDataServiceImpl.java | 10 +++ .../resources/mapper/KwMeterDataMapper.xml | 73 ++++++++++++++++++- 6 files changed, 113 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index 31220dec6..c39121510 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -53,6 +53,12 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; + @io.swagger.annotations.ApiModelProperty(value = "时段用电量", name = "usedPower") + private Integer usedPower; + + @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始时间", name = "lastDeviceTime") + private Date lastDeviceTime; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index c3c50486d..b28c3c124 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -29,12 +29,12 @@ public class KwMeterDataVo extends BaseEntity { private Integer totalPower; @io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "createTime") - private Date createTime; + private Date reportTime; @io.swagger.annotations.ApiModelProperty(value = "统计开始时间", name = "startTime") - private Date startTime; + private Date recordStartTime; @io.swagger.annotations.ApiModelProperty(value = "统计结束时间", name = "endTime") - private Date endTime; + private Date recordEndTime; } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java index e374f96af..ba2b9d1ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterDataService.java @@ -13,5 +13,9 @@ public interface KwMeterDataService { List findVoList(KwMeterDataDto kwMeterDataDto); + PageInfo listAsPage(KwMeterData kwMeterData, Integer pageIndex, Integer pageSize); + + List findList(KwMeterData kwMeterData); + int save(KwMeterData record); } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 4887daa3a..d2caa5fdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -89,16 +89,23 @@ public class KwBoxServiceImpl implements KwBoxService { } @Override - public KwMeterData saveMeterData(KwBox record, Date deviceTime, String addr, String activePower){ + public KwMeterData saveMeterData(KwBox kwBox, Date deviceTime, String addr, String activePower){ - KwMeter kwMeter = findMeter(record, addr); + KwMeter kwMeter = findMeter(kwBox, addr); if (kwMeter==null) return null; + KwMeterData record = new KwMeterData(); + record.setBoxId(kwBox.getId()); + record.setMeterId(kwMeter.getId()); + record.setTotalPower(0); //set in sql not null + record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); + PageInfo kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); + KwMeterData kwMeterData = new KwMeterData(); - kwMeterData.setTenantId(record.getTenantId()); + kwMeterData.setTenantId(kwBox.getTenantId()); kwMeterData.setAddress(addr); - kwMeterData.setBoxId(record.getId()); + kwMeterData.setBoxId(kwBox.getId()); kwMeterData.setCreateTime(new Date()); kwMeterData.setDeviceTime(deviceTime); kwMeterData.setMeterId(kwMeter.getId()); @@ -106,6 +113,14 @@ public class KwBoxServiceImpl implements KwBoxService { kwMeterData.setTotalPower(Integer.parseInt(activePower)); } + if (kwMeterDataPage.getList().size() > 0 + && kwMeterDataPage.getList().get(0).getTotalPower() != null + && kwMeterData.getTotalPower() != null) { + kwMeterData.setUsedPower( + kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); + kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + } + kwMeterDataService.save(kwMeterData); return kwMeterData; } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java index 84076a199..f83758b80 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterDataServiceImpl.java @@ -34,6 +34,16 @@ public class KwMeterDataServiceImpl implements KwMeterDataService { return kwMeterDataMapper.findVoList(kwMeterDataDto); } + @Override + public PageInfo listAsPage(KwMeterData kwMeterData, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterDataMapper.findList(kwMeterData)); + } + + @Override + public List findList(KwMeterData kwMeterData) { + return kwMeterDataMapper.findList(kwMeterData); + } + @Override public int save(KwMeterData record) { final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 1edbb5679..b1eb8f3e1 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -22,11 +22,27 @@ and `id` = #{id} - + and `tenant_id` = #{tenantId} - + + + and `box_id` = #{meterId} + + + + and `meter_id` = #{meterId} + + + + and `address` = #{address} + + + + and `total_power` is not null + + and id in @@ -44,4 +60,57 @@ + + + + + + + + + + + where 1 = 1 + + + and `tenant_id` = #{tenantId} + + + + and `box_id` = #{meterId} + + + + and `meter_id` = #{meterId} + + + + and `address` = #{address} + + + + and `create_time` between #{startTime} and #{endTime} + + + + + + + From 8886d74a828478a5de20f3c9340c3e673d0bdbaf Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 21:17:48 +0800 Subject: [PATCH 262/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AE=BF=E9=97=AE=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/KwMeterDataMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index b1eb8f3e1..c213d78cc 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -60,7 +60,7 @@ - + @@ -95,7 +95,7 @@ - select temp.tenant_id, date_format(temp.create_time, '%Y-%m-%d %H:00:00') as reportTime, From 12f6d9c294fdba6bff922bcadeadb8d94a378e62 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 21:33:52 +0800 Subject: [PATCH 263/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/kw/impl/KwBoxServiceImpl.java | 20 ++++++++++--------- .../resources/mapper/KwMeterDataMapper.xml | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index d2caa5fdb..339bb5ec1 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -95,12 +95,6 @@ public class KwBoxServiceImpl implements KwBoxService { if (kwMeter==null) return null; - KwMeterData record = new KwMeterData(); - record.setBoxId(kwBox.getId()); - record.setMeterId(kwMeter.getId()); - record.setTotalPower(0); //set in sql not null - record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); - PageInfo kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setTenantId(kwBox.getTenantId()); @@ -113,9 +107,17 @@ public class KwBoxServiceImpl implements KwBoxService { kwMeterData.setTotalPower(Integer.parseInt(activePower)); } - if (kwMeterDataPage.getList().size() > 0 - && kwMeterDataPage.getList().get(0).getTotalPower() != null - && kwMeterData.getTotalPower() != null) { + if (kwMeterData.getTotalPower() != null) { + + KwMeterData record = new KwMeterData(); + record.setBoxId(kwBox.getId()); + record.setMeterId(kwMeter.getId()); + record.setTotalPower(0); //set in sql not null + record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); + PageInfo kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); + + if (kwMeterDataPage.getList().size() > 0 + && kwMeterDataPage.getList().get(0).getTotalPower() != null) kwMeterData.setUsedPower( kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index c213d78cc..ee449b335 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -76,8 +76,8 @@ and `tenant_id` = #{tenantId} - - and `box_id` = #{meterId} + + and `box_id` = #{boxId} From a00badf25a400a99f186344abd7d983e6a965d00 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 21:43:08 +0800 Subject: [PATCH 264/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/kw/impl/KwBoxServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/KwMeterDataMapper.xml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index 339bb5ec1..d3e1a4e5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -116,11 +116,11 @@ public class KwBoxServiceImpl implements KwBoxService { record.setSortColumns(KwMeterData.Field.DeviceTime_DESC); PageInfo kwMeterDataPage = kwMeterDataService.listAsPage(record,1,1); - if (kwMeterDataPage.getList().size() > 0 - && kwMeterDataPage.getList().get(0).getTotalPower() != null) - kwMeterData.setUsedPower( - kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); - kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + if (kwMeterDataPage.getList().size() > 0) { + kwMeterData.setUsedPower( + kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); + kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + } } kwMeterDataService.save(kwMeterData); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index ee449b335..deb203b67 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -27,8 +27,8 @@ and `tenant_id` = #{tenantId} - - and `box_id` = #{meterId} + + and `box_id` = #{boxId} From af58f6274505b9d676fa74fbb3e746a3eddef47f Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 18 Jun 2019 21:51:29 +0800 Subject: [PATCH 265/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:=E7=94=B5=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/KwMeterDataMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index deb203b67..c43d24899 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -4,16 +4,18 @@ - + + + - `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time` + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time` From c61f87029552f9fa21898cb05cec9ce4e97a6368 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 10:27:04 +0800 Subject: [PATCH 266/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 96 ++++++++----------- 1 file changed, 40 insertions(+), 56 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index fba23c87d..cbd7bd459 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -295,14 +295,9 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_ASSIGNEE_NODIFY.getCode()); wxMsgRecord.setReceiver(phone); wxMsgRecord.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ dynamicContentMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ dynamicContentMap.put("bustype","账单"); dynamicContentMap.put("contract", businessId.toString()); } @@ -376,21 +371,36 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ dynamicContentMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ dynamicContentMap.put("bustype","账单"); dynamicContentMap.put("contract", businessId.toString()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } + } + + public boolean isContract(Integer flowType){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) + ||EnumFlowKey.END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) + || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) + ){ + return true; + } + return false; + } + public boolean isBill(Integer flowType){ + if(EnumFlowKey.BILL.getCode().equals(flowType) + ||EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)){ + return true; + } + return false; } public String variablesToJson(List> variables){ @@ -526,6 +536,7 @@ public class WxFlowServiceImpl implements WxFlowService { WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + wxFlowRecord.setTaskKey(task.getTaskDefinitionKey()); resultList.add(0,wxFlowRecord); //不是最后一个节点,设置下一个待审批节点代办人 @@ -545,6 +556,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + wxFlowRecord.setTaskKey(UUID.randomUUID().toString()); resultList.add(0,wxFlowRecord); break; } @@ -576,6 +588,7 @@ public class WxFlowServiceImpl implements WxFlowService { WxFlowRecord wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + wxFlowRecord.setTaskKey(assignee.getKey()); resultList.add(0,wxFlowRecord); //不是最后一个节点,设置下一个待审批节点代办人 @@ -597,6 +610,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord = new WxFlowRecord(); wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); + wxFlowRecord.setTaskKey(UUID.randomUUID().toString()); resultList.add(0,wxFlowRecord); break; } @@ -737,14 +751,9 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_APPLY_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -761,14 +770,9 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -795,14 +799,9 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_PASS_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -819,14 +818,9 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -940,14 +934,9 @@ public class WxFlowServiceImpl implements WxFlowService { wxMsgRecord.setModelType(EnumMsgModel.FLOW_REJECT_NODIFY.getCode()); wxMsgRecord.setReceiver(userMap!=null?(String)userMap.get("phone"):""); wxMsgRecord.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } @@ -971,14 +960,9 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_SHOP_END_CONTRACT.getCode().equals(flowType) - ){ + if(isContract(flowType)){ msgReplaceMap.put("bustype","合同"); - }else if(EnumFlowKey.BILL.getCode().equals(flowType)){ + }else if(isBill(flowType)){ msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("contract", businessId.toString()); } From 829f200166229b7dcea4934b8920a32afd133376 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 10:49:13 +0800 Subject: [PATCH 267/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index cbd7bd459..d85a2e157 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -372,10 +372,10 @@ public class WxFlowServiceImpl implements WxFlowService { mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); if(isContract(flowType)){ - dynamicContentMap.put("bustype","合同"); + msgReplaceMap.put("bustype","合同"); }else if(isBill(flowType)){ - dynamicContentMap.put("bustype","账单"); - dynamicContentMap.put("contract", businessId.toString()); + msgReplaceMap.put("bustype","账单"); + msgReplaceMap.put("contract", businessId.toString()); } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); From 705243747b19b456ae78aa6535de9b7c5d81c117 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 10:56:02 +0800 Subject: [PATCH 268/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][init=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201906191052__L_ADD_FLOW.sql | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906191052__L_ADD_FLOW.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906191052__L_ADD_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201906191052__L_ADD_FLOW.sql new file mode 100644 index 000000000..079db970d --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906191052__L_ADD_FLOW.sql @@ -0,0 +1,25 @@ + +CREATE TABLE `wx_flow_config` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `parent_id` bigint(20) NOT NULL COMMENT '父类id', + `tenant_id` varchar(10) NOT NULL COMMENT '租户id', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `type` tinyint(1) DEFAULT '0' COMMENT '流程类型4商铺签约5多径签约6商铺终止7多径终止8账单变更9有价卷上架', + `model_id` bigint(20) NOT NULL COMMENT '模板id', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + `sort` tinyint(1) DEFAULT '0' COMMENT '顺序', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; + +CREATE TABLE `wx_flow_model` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(10) NOT NULL COMMENT '租户id', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `flow` json DEFAULT NULL COMMENT '流程', + `create_user` bigint(20) NOT NULL COMMENT '创建用户', + `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + `flow_id` varchar(255) DEFAULT NULL COMMENT '流程id', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; \ No newline at end of file From 9ec92a030dfd3ea3d19d60d2a33b458fab710a4e Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 11:07:50 +0800 Subject: [PATCH 269/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][init=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201906191100__L_ADD_FLOW_DATA.sql | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql new file mode 100644 index 000000000..010b567b0 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql @@ -0,0 +1,110 @@ +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '789', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '789', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '789', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '790', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '790', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '790', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1001', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1001', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1001', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1002', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1002', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1002', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1003', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1003', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1003', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1004', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1004', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1004', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1005', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1005', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1005', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1006', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1006', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1006', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1007', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1007', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1007', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1008', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1008', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1008', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + +INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) +VALUES + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1009', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1009', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1009', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); From e85b9ded910c788d5efb993a0a92fc630dc3918f Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 11:11:58 +0800 Subject: [PATCH 270/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][init=E8=A1=A8sql]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sql => V201906191110__L_ADD_FLOW_DATA.sql} | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V201906191100__L_ADD_FLOW_DATA.sql => V201906191110__L_ADD_FLOW_DATA.sql} (55%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201906191110__L_ADD_FLOW_DATA.sql similarity index 55% rename from mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql rename to mallinkAdmin/src/main/resources/db/migration/V201906191110__L_ADD_FLOW_DATA.sql index 010b567b0..caa6b7ed0 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201906191100__L_ADD_FLOW_DATA.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201906191110__L_ADD_FLOW_DATA.sql @@ -1,110 +1,110 @@ INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '789', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '789', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '789', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '789', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '789', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '790', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '790', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '790', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '790', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '790', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1001', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1001', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1001', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1001', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1001', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1002', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1002', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1002', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1002', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1002', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1003', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1003', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1003', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1003', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1003', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1004', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1004', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1004', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1004', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1004', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1005', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1005', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1005', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1005', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1005', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1006', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1006', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1006', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1006', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1006', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1007', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1007', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1007', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1007', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1007', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1008', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1008', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1008', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1008', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1008', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`, `name`, `type`, `model_id`, `create_date`, `update_date`, `sort`) VALUES - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多经点位合同终止', 7, 299438525856612352, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多经点位合同终止', 7, 0, '2019-06-11 14:02:43', '2019-06-11 14:02:43', 4), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1009', '合同审批', 0, 0, '2019-06-11 13:42:18', '2019-06-11 13:42:18', 1), ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 0, '1009', '账单审批', 0, 0, '2019-06-11 13:49:43', '2019-06-11 13:49:43', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同签约', 4, 300431745482752000, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同终止', 6, 300429126869712896, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多径点位合同签约', 5, 300469143855955968, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), - ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1009', '账单应收金额变更', 8, 300469254627524608, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同签约', 4, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 1), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '商铺合同终止', 6, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 3), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256630, '1009', '多径点位合同签约', 5, 0, '2019-06-11 14:02:42', '2019-06-11 14:02:42', 2), + ((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)), 1560256631, '1009', '账单应收金额变更', 8, 0, '2019-06-11 14:02:44', '2019-06-11 14:02:44', 1); From 3607840ac9f911f0292b166266fb4a20033f1874 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 11:24:55 +0800 Subject: [PATCH 271/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxFlowConfigMapper.java | 2 ++ .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 1 + .../src/main/resources/mapper/WxFlowConfigMapper.xml | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java index f9c7dfbd9..3ba014513 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java @@ -16,4 +16,6 @@ public interface WxFlowConfigMapper extends CommonMapper { */ List findChildList(); + void updateTime(WxFlowConfig wxFlowConfig); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index d85a2e157..3c02a554a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1250,6 +1250,7 @@ public class WxFlowServiceImpl implements WxFlowService { @Override public ResultData updateConfig(WxFlowConfig wxFlowConfig) { + wxFlowConfig.setUpdateDate(new Date()); wxFlowConfigMapper.updateByPrimaryKeySelective(wxFlowConfig); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml index 4025c48c2..134f3619c 100644 --- a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -37,4 +37,9 @@ SELECT * FROM wx_flow_config WHERE parent_id = #{id} ORDER BY sort ASC + + update wx_flow_config set update_date = now() where model_id = #{modelId} + + + From 4ed1b9ec00e0903d6e3dbbf9579a71473da2e29b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 11:30:14 +0800 Subject: [PATCH 272/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1466.1934=EF=BC=9A=E8=B4=A6=E5=8D=95=E6=BB=9E=E7=BA=B3?= =?UTF-8?q?=E9=87=91=E6=B2=A1=E6=9C=89=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 1 + .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 1 + .../src/main/resources/mapper/WxRentContractMapper.xml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1bf4e2e13..49cdfdd1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -131,6 +131,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setRevenue(record.getRevenue()); property.setLatePayRatio(record.getLatePayRatio()); property.setLatePayTime(record.getLatePayTime()); + property.setLatePayStatus(record.getLatePayStatus()); property.setPayDate(record.getPayDate()); property.setPay(record.getPay()); property.setReceivePay(record.getReceivePay()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index ee52bdbd8..829cc17e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -131,6 +131,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setRevenue(record.getRevenue()); wxBillRent.setLatePayRatio(record.getLatePayRatio()); wxBillRent.setLatePayTime(record.getLatePayTime()); + wxBillRent.setLatePayStatus(record.getLatePayStatus()); wxBillRent.setPay(record.getPay()); wxBillRent.setReceivePay(record.getReceivePay()); wxBillRent.setOwe(record.getReceivePay()-record.getPay()); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 14ad7bbb7..2e8567138 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -338,7 +338,8 @@ and json_extract(rc.rent_info,'$[*].shopNumber') like concat('%',#{shopNumber},'%') - and s.`shop_number` like concat('%',#{shopNumber},'%') + and s.`shop_number` like concat('%',#{shopNumber},'%')ig + and rc.`status` = #{status} and rc.`type` = #{type} From 529c04f6654f17902d76f3119156176a9934f8e6 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Jun 2019 11:30:20 +0800 Subject: [PATCH 273/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/dto/KwMeterDataDto.java | 2 +- .../com/iformall/domain/vo/KwMeterDataVo.java | 12 ++++---- .../resources/mapper/KwMeterDataMapper.xml | 29 ++++++++++++++----- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index d12354a85..28e19e8dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -46,7 +46,7 @@ public class KwMeterDataDto extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") private Date endTime; - private Integer type; + private Integer reportType; public static enum Field { Id_ASC("`id` ASC"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index b28c3c124..b35346f6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -22,19 +22,19 @@ public class KwMeterDataVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address") private String address; - @io.swagger.annotations.ApiModelProperty(value = "使用的电量", name = "startTime") + @io.swagger.annotations.ApiModelProperty(value = "使用的电量", name = "usedPower") private Integer usedPower; - @io.swagger.annotations.ApiModelProperty(value = "总电量", name = "startTime") + @io.swagger.annotations.ApiModelProperty(value = "总电量", name = "totalPower") private Integer totalPower; - @io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "createTime") - private Date reportTime; + @io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "reportTime") + private String reportTime; - @io.swagger.annotations.ApiModelProperty(value = "统计开始时间", name = "startTime") + @io.swagger.annotations.ApiModelProperty(value = "统计开始时间", name = "recordStartTime") private Date recordStartTime; - @io.swagger.annotations.ApiModelProperty(value = "统计结束时间", name = "endTime") + @io.swagger.annotations.ApiModelProperty(value = "统计结束时间", name = "recordEndTime") private Date recordEndTime; } diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index c43d24899..c42e8ca06 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -66,7 +66,7 @@ - + @@ -100,17 +100,30 @@ From 2d76dd92bfb24d1257ae28e542e16393b545597f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 12:47:07 +0800 Subject: [PATCH 274/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][C=E7=AB=AF?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=A7=AF=E5=88=86=E6=8A=A5=E5=90=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E8=A6=81=E5=9C=A8=E7=A7=AF=E5=88=86=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E4=B8=8B=E6=9C=89=E8=AE=B0=E5=BD=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxActivityJoinServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 0a2c23110..4159b5869 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -169,6 +169,8 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { data.put("totalCredit", userCredit); //积分历史 WxCreditHistory wxCreditHistory = new WxCreditHistory(); + final IdWorker idWorker = IdWorker.get(); + wxCreditHistory.setId(idWorker.nextId()); wxCreditHistory.setTenantId(wxActivity.getTenantId()); wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); wxCreditHistory.setCreditAmount(userCredit); From 0b8cb997c7226c99bdbc4453a9430c3c278af877 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 13:12:41 +0800 Subject: [PATCH 275/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][C=E7=AB=AF?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=A7=AF=E5=88=86=E6=8A=A5=E5=90=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E8=A6=81=E5=9C=A8=E7=A7=AF=E5=88=86=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E4=B8=8B=E6=9C=89=E8=AE=B0=E5=BD=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxActivityJoinServiceImpl.java | 28 +++++++------------ .../impl/WxCreditHistoryServiceImpl.java | 3 ++ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 4159b5869..2e8d5cf5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -16,6 +16,7 @@ import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.ExcelService; import com.iformall.service.WxActivityJoinService; +import com.iformall.service.WxCreditHistoryService; import com.iformall.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -60,6 +61,10 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { @Autowired WxCreditHistoryMapper wxCreditHistoryMapper; + @Autowired + WxCreditHistoryService wxCreditHistoryService; + + @Override public PageInfo listAsPage(WxActivityJoin record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxActivityJoinMapper.findList(record)); @@ -154,32 +159,19 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); Date date = new Date(); if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) { - Integer userCredit = user.getCredit(); Integer credit = wxActivity.getCredit(); - Map data = new HashMap<>(2); - if (credit > userCredit) { - data.put("useCredit", credit); - data.put("totalCredit", userCredit); - return new ResultData(ErrorCode.CREDIT_NOT_ENOUGH, data); - } - userCredit = userCredit - credit; - user.setCredit(userCredit); - wxCUserMapper.updateByPrimaryKeySelective(user); - data.put("useCredit", credit); - data.put("totalCredit", userCredit); //积分历史 WxCreditHistory wxCreditHistory = new WxCreditHistory(); - final IdWorker idWorker = IdWorker.get(); - wxCreditHistory.setId(idWorker.nextId()); wxCreditHistory.setTenantId(wxActivity.getTenantId()); wxCreditHistory.setCUserId(wxActivityJoin.getUserId()); - wxCreditHistory.setCreditAmount(userCredit); - wxCreditHistory.setCreditNum(-credit); + wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode()); - wxCreditHistory.setCreateDate(date); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); wxCreditHistory.setOperatorId(wxActivityJoin.getUserId()); - wxCreditHistoryMapper.updateByPrimaryKeySelective(wxCreditHistory); + WxCreditHistory creditHistory = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); + Map data = new HashMap<>(2); + data.put("useCredit", credit); + data.put("totalCredit", creditHistory.getCreditAmount()); } //保存到报名表中 final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 4d09a34d8..c3a6d8a1a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -266,6 +266,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType() == EnumScoreType.MEM_IMPORT.getCode()) { return record.getCreditNum(); } + if (record.getCreditType() == EnumScoreType.ACTIVITY_JOIN.getCode()) { + return reduceCredit(record); + } return 0; } From d1ddffce5b9a53137e66b61a78c9df3ffac39957 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Jun 2019 14:07:03 +0800 Subject: [PATCH 276/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E7=94=B5=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/KwMeterDataMapper.xml | 53 ++++++++++++------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index c42e8ca06..3b2134462 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -99,32 +99,45 @@ From 4cd6f89df232f871120eab58927edf17b64c9825 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Jun 2019 14:33:48 +0800 Subject: [PATCH 277/289] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E7=94=B5=E9=87=8F=E7=BB=9F=E8=AE=A1=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/KwMeterData.java | 3 +++ .../src/main/java/com/iformall/domain/vo/KwMeterDataVo.java | 3 +++ .../java/com/iformall/service/kw/impl/KwBoxServiceImpl.java | 2 +- .../src/main/resources/mapper/KwMeterDataMapper.xml | 6 +++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java index c39121510..4e0151bc6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java @@ -59,6 +59,9 @@ public class KwMeterData extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始时间", name = "lastDeviceTime") private Date lastDeviceTime; + @io.swagger.annotations.ApiModelProperty(value = "时段用电量开始电量", name = "lastTotalPower") + private Integer lastTotalPower; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java index b35346f6a..0920d2614 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMeterDataVo.java @@ -28,6 +28,9 @@ public class KwMeterDataVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "总电量", name = "totalPower") private Integer totalPower; + @io.swagger.annotations.ApiModelProperty(value = "最近一次总电量", name = "lastTotalPower") + private Integer lastTotalPower; + @io.swagger.annotations.ApiModelProperty(value = "记录时间", name = "reportTime") private String reportTime; diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java index d3e1a4e5b..590a0c102 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java @@ -95,7 +95,6 @@ public class KwBoxServiceImpl implements KwBoxService { if (kwMeter==null) return null; - KwMeterData kwMeterData = new KwMeterData(); kwMeterData.setTenantId(kwBox.getTenantId()); kwMeterData.setAddress(addr); @@ -120,6 +119,7 @@ public class KwBoxServiceImpl implements KwBoxService { kwMeterData.setUsedPower( kwMeterData.getTotalPower()-kwMeterDataPage.getList().get(0).getTotalPower()); kwMeterData.setLastDeviceTime(kwMeterDataPage.getList().get(0).getDeviceTime()); + kwMeterData.setLastTotalPower(kwMeterDataPage.getList().get(0).getTotalPower()); } } diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 3b2134462..fd1948a25 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -12,10 +12,11 @@ + - `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time` + `id`,`tenant_id`,`meter_id`,`box_id`,`address`,`total_power`,`device_time`,`create_time`,`used_power`,`last_device_time`,`last_total_power` @@ -65,6 +66,7 @@ + @@ -104,6 +106,7 @@ min(temp.recordStartTime) as recordStartTime, max(temp.recordEndTime) as recordEndTime, sum(temp.totalPower) as totalPower, + sum(temp.lastTotalPower) as lastTotalPower, sum(temp.usedPower) as usedPower from (SELECT @@ -121,6 +124,7 @@ date_format(temp.create_time, '%Y-%m') as reportTime, min(last_device_time) as recordStartTime, + min(last_total_power) as lastTotalPower, max(device_time) as recordEndTime, max(total_power) as totalPower, sum(used_power) as usedPower From c1b55bc47383414258fff6866a747eae10d19bb8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 19 Jun 2019 15:20:00 +0800 Subject: [PATCH 278/289] =?UTF-8?q?[=E8=8F=9C=E5=8D=95][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]:=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906191516__CHANGE_MENU.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906191516__CHANGE_MENU.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906191516__CHANGE_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201906191516__CHANGE_MENU.sql new file mode 100644 index 000000000..9cb134b64 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906191516__CHANGE_MENU.sql @@ -0,0 +1,4 @@ +-- 商铺租赁账单 +UPDATE `mall_permission` set `name` = '商铺租金账单' WHERE id = 402; +-- 多经点位租赁账单 +UPDATE `mall_permission` set `name` = '多经点位租金账单' WHERE id = 404; \ No newline at end of file From 0f7b02c535e861285bb7db8416ec750fc24861a6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 16:31:57 +0800 Subject: [PATCH 279/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1486.1952=20=EF=BC=9A=E8=B4=A6=E5=8D=95=E4=B8=8B=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E6=9F=A5=E7=9C=8B=E6=8E=A5=E5=8F=A3500]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillActionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index 860f9b944..c56cf6e52 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -15,7 +15,7 @@ - `id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime`, + `id`,`tenant_id`,`bill_id`,`user_id`,`user_name`,`phone`,`action`,`details`,`createtime`,`updatetime` From ae7f3b1d29f9ee6b161a86ada6665d78854b9f14 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 17:22:51 +0800 Subject: [PATCH 280/289] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/schedule/ActivitySchedule.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index b9381678b..4c26ab22f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -124,10 +124,6 @@ public class ActivitySchedule { wxCampaignMapper.updateByPrimaryKeySelective(wxCampaign); } } - //更新报名状态 - if (!activityList.isEmpty()) { - wxActivityJoinMapper.updateStatus(activityList); - } } } \ No newline at end of file From 554570a87127544843d4f99da13a5a5450559c1b Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 20:55:41 +0800 Subject: [PATCH 281/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=AD=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/WxFlowAbleController.java | 16 ---------------- .../service/impl/WxFlowServiceImpl.java | 8 +++----- .../impl/WxRentContractServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index eceab6c9a..c2e7cbc85 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -20,7 +20,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.*; @RestController @@ -31,8 +30,6 @@ public class WxFlowAbleController extends BaseController { @Autowired private WxFlowService wxFlowService; -// @Autowired -// RuntimeService runtimeService; @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @PostMapping("/start") @@ -43,19 +40,6 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.start(params, user.getId(),user.getName(),user.getTenantId()); } - /** - * 删除流程 - */ -// @GetMapping(value = "/del") -// public ResultData del(String id,String x) { -// if("xll1dxx1314".equals(x)) { -// runtimeService.deleteProcessInstance(id, "驳回"); -// return new ResultData(); -// }else{ -// return new ResultData("fail"); -// } -// } - /** * 用户代办列表 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 3c02a554a..eaaedca00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -225,7 +225,6 @@ public class WxFlowServiceImpl implements WxFlowService { map.put(userTaskVo.getKey()+"_signAssignee",assigneeList); } } - } @Override @@ -619,7 +618,7 @@ public class WxFlowServiceImpl implements WxFlowService { } } } - // 设置最后一个发起节点 + // 只展示最后一次发起,设置最后一个发起节点 if(CollectionUtils.isNotEmpty(resultList)){ for (int i = 0; i < resultList.size() ; i++) { if(resultList.get(i).getStatus() == 1){ @@ -630,12 +629,11 @@ public class WxFlowServiceImpl implements WxFlowService { } } - // 合并会签节点展 + // 合并会签节点展示 Map map = new LinkedHashMap<>(); for (WxFlowRecord r:resultList) { - if(r.getTaskKey() == null){ + if(r.getTaskKey() == null) r.setTaskKey(r.getTaskName()); - } WxFlowRecord mapR = map.get(r.getTaskKey()); if(mapR != null) mapR.setUserName(mapR.getUserName()+","+r.getUserName()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index b6049d1a2..0f867ee71 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1956,6 +1956,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { diff = DateUtils.getDiff(start,currEnd); total = (diff[1]+1) * price; + int warnCount = 0; while (true){ Date monthStartDate = DateUtils.getDaySet(currEnd,Calendar.DATE,1); dayCount = DateUtils.getMonthDayCount(monthStartDate); @@ -1975,6 +1976,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { diff = DateUtils.getDiff(monthStartDate,currEnd); total += price * (diff[1] +1); } + + //预警 + if(warnCount >= 1000){ + Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); + logger.error("getNeedPay() warnCount max error !!!"); + break; + } + warnCount ++; } return total; } @@ -1982,6 +1991,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { public static List initBillTimeList(Date start,Date end,Integer adjustPeriod,Integer dayType,int receivePeriod){ List list = new ArrayList<>(); + int warnCount = 0; int count = 0; while (true){ BillTimeVo timeVo = new BillTimeVo(); @@ -2034,6 +2044,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { break; } count ++; + + //预警 + if(warnCount >= 1000){ + Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); + logger.error("initBillTimeList() warnCount max error !!!"); + break; + } + warnCount ++; } return list; } From 54313d6029afc9e457692faaf9c19aa755744bdf Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 21:02:16 +0800 Subject: [PATCH 282/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=AD=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0f867ee71..dd6fb7a62 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1980,7 +1980,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //预警 if(warnCount >= 1000){ Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); - logger.error("getNeedPay() warnCount max error !!!"); + logger.error("getNeedPay() warnCount max error !!! monthPrice:{},dayPrice:{},start:{},end:{}",monthPrice,dayPrice,sd.format(start),sd.format(end)); break; } warnCount ++; From 7cd8cf44480b2b6c8a647fec8cdf24538905f33e Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 21:11:05 +0800 Subject: [PATCH 283/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index dd6fb7a62..585747e8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1991,7 +1991,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { public static List initBillTimeList(Date start,Date end,Integer adjustPeriod,Integer dayType,int receivePeriod){ List list = new ArrayList<>(); - int warnCount = 0; int count = 0; while (true){ BillTimeVo timeVo = new BillTimeVo(); @@ -2046,12 +2045,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { count ++; //预警 - if(warnCount >= 1000){ + if(count >= 1000){ Logger logger = LoggerFactory.getLogger(WxRentContractServiceImpl.class); logger.error("initBillTimeList() warnCount max error !!!"); break; } - warnCount ++; } return list; } From e741aa26a9f24360556f8e32615dcd06abcc2c4a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 20:41:04 +0800 Subject: [PATCH 284/289] =?UTF-8?q?[Bug][=E4=BF=AE=E6=94=B9][dev=20version?= =?UTF-8?q?:.1486.1952=20=EF=BC=9A=E5=95=86=E9=93=BA=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=EF=BC=9A=E7=94=9F=E6=88=90=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=88=87=E6=8D=A2=E7=94=9F=E6=88=90=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=91=A8=E6=9C=9F=E6=97=B6=E9=97=B4=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 22 ++++++++++++++----- .../service/WxPropertyContractService.java | 4 +++- .../impl/WxPropertyContractServiceImpl.java | 7 +++++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 7b00553d7..d40bf7d3b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.Map; /** @@ -59,11 +60,12 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); + Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); } @PostMapping("updateRentStartTime") @@ -72,6 +74,7 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ propertyContract.setRentalStartDate(propertyContract.getStartDate()); @@ -81,7 +84,7 @@ public class WxPropertyContractController extends BaseController { propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); - return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate); } @@ -89,11 +92,20 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); + Date oldDate = wxPropertyContract.getRentalStartDate(); + + if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { + propertyContract.setRentalStartDate(propertyContract.getStartDate()); + } + MallUserInfo user = getUser(); - wxPropertyContract.setTenantId(user.getTenantId()); - wxPropertyContract.setAdjustPeriodHandle(); + propertyContract.setTenantId(user.getTenantId()); + propertyContract.setAdjustPeriodHandle(); + propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); //第三步提交 SWITCH - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 6e845ec8b..64143f7bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxPropertyContract; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Date; import java.util.List; import java.util.Map; @@ -36,9 +37,10 @@ public interface WxPropertyContractService { * 保存或更新实体 * @param record * @param userId + * @param oldDate * @return */ - ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName); + ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 4462a78ca..06dbab3a9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -211,7 +211,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { + public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate) { // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ @@ -318,6 +318,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (wxPropertyContract == null) { return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); } + record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); record.setRentalEndDate(wxRentContract.getRentalEndDate()); record.setStartDate(wxRentContract.getStartDate()); @@ -707,6 +708,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); Integer lease = wxPropertyContract.getLease(); Date rentalStartDate = propertyContract.getRentalStartDate(); + if (propertyContract.getRentShopType().equals(EnumRentStartType.STARTTIME.getCode())) { + rentalStartDate = propertyContract.getStartDate(); + } + propertyContract.setRentalStartDate(rentalStartDate); Long price = propertyContract.getPrice(); //按月计租 From d80859040c080875f0af394b5aba3b1e549ebe7f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 21:02:28 +0800 Subject: [PATCH 285/289] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8C=89=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxRentContractMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 2e8567138..b2761a939 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -338,7 +338,7 @@ and json_extract(rc.rent_info,'$[*].shopNumber') like concat('%',#{shopNumber},'%') - and s.`shop_number` like concat('%',#{shopNumber},'%')ig + and s.`shop_number` like concat('%',#{shopNumber},'%') and rc.`status` = #{status} From b6fe63d091293992dc37f7a4aee3c3f9365ecdea Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 21:08:13 +0800 Subject: [PATCH 286/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20=20vers?= =?UTF-8?q?ion:.1510.1953=EF=BC=9A=E5=95=86=E9=93=BA=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E4=B8=8B=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E7=A7=9F=E9=87=91=E8=B4=A6=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E4=B8=9A=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 585747e8d..70a4c054a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1372,11 +1372,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setRentContractId(record.getId()); - WxPropertyContract propertyContract = wxPropertyContractMapper.select(wxPropertyContract).parallelStream() - .filter(p -> p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || - p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || - p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())). - findFirst().orElse(null); + wxPropertyContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContract); if (propertyContract != null) { wxPropertyContractService.updatePropertyContractStatus(propertyContract.getId()); } From d4235447d99c0143ca7cbe3f69c9ba37833454e2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 19 Jun 2019 21:11:23 +0800 Subject: [PATCH 287/289] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][dev=20=20vers?= =?UTF-8?q?ion:.1510.1953=EF=BC=9A=E5=95=86=E9=93=BA=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E4=B8=8B=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E7=A7=9F=E9=87=91=E8=B4=A6=E5=8D=95=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E4=B8=9A=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 812e7c0eb..4dddfcf98 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -414,7 +414,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { //作废合同 wxRentContractService.updateInvalidContract(wxMerchant.getRentContractId()); //合并合同-更新物业账单 - wxRentContractService.updatePropertyPreviewBill(wxRentContract); + if (wxRentContract.getOperationType().equals(EnumContractOperationType.WHOLE.getCode())) { + wxRentContractService.updatePropertyPreviewBill(wxRentContract); + } } return new ResultData(Result.SUCCESS, "商户创建成功", merchantId); } catch (Exception e) { From 851286cf66870345d8b13c2711bb1dd2754318d4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 19 Jun 2019 22:29:24 +0800 Subject: [PATCH 288/289] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?][=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxFlowRecord.java | 4 +++ .../service/impl/WxFlowServiceImpl.java | 30 ++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java index 54e9fae3e..bd86e526f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java @@ -57,6 +57,10 @@ public class WxFlowRecord implements Serializable { private Integer isLastStart; @Transient private Integer limit; + //1普通 2会签 3或签 + @Transient + private Integer taskType; + public WxFlowRecord(){} public WxFlowRecord(Long businessId){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index eaaedca00..9c938a750 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -588,6 +588,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); wxFlowRecord.setTaskKey(assignee.getKey()); + wxFlowRecord.setTaskType(assignee.getType()); resultList.add(0,wxFlowRecord); //不是最后一个节点,设置下一个待审批节点代办人 @@ -610,6 +611,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxFlowRecord.setUserName(userName.trim()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); wxFlowRecord.setTaskKey(UUID.randomUUID().toString()); + wxFlowRecord.setTaskType(assignee.getType()); resultList.add(0,wxFlowRecord); break; } @@ -635,10 +637,20 @@ public class WxFlowServiceImpl implements WxFlowService { if(r.getTaskKey() == null) r.setTaskKey(r.getTaskName()); WxFlowRecord mapR = map.get(r.getTaskKey()); - if(mapR != null) - mapR.setUserName(mapR.getUserName()+","+r.getUserName()); - else - map.put(r.getTaskKey(),r); + if(mapR != null) { + //如果是会签代办,合并后去掉已经完成的 + if(EnumTaskType.AND.getCode().equals(mapR.getTaskType()) + && EnumFlowRecordStatus.ASSIGNEE.getCode().equals(mapR.getStatus()) + && r.getTaskKey().equals(mapR.getTaskKey()) + ){ + String newName = mapR.getUserName().replace(r.getUserName(),""); + mapR.setUserName(subUserName(newName)); + continue; + } + mapR.setUserName(mapR.getUserName() + "," + r.getUserName()); + }else{ + map.put(r.getTaskKey(), r); + } } List flowRecordList = new ArrayList<>(); @@ -649,6 +661,16 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(flowRecordList); } + public String subUserName(String name){ + if(name.startsWith(",")){ + return name.substring(1,name.length()); + } + if(name.endsWith(",")){ + return name.substring(0,name.length()-1); + } + return name.replace(",,",","); + } + @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) public ResultData apply(Map params,Long userId,String userName,String tenantId) { From ec37fff21bed9a308552038e52ba8c539333106e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 19 Jun 2019 23:39:34 +0800 Subject: [PATCH 289/289] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallUserActionController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java index ad5936482..ce9921d22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java @@ -8,6 +8,7 @@ import com.iformall.service.MallUserActionService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +28,13 @@ public class MallUserActionController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute MallUserActionVo userAction, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserActionController::list"); - if (null == userAction) userAction = new MallUserActionVo(); + if (null == userAction) { + userAction = new MallUserActionVo(); + } else { + if(StringUtils.isBlank(userAction.getName())) { + userAction.setName(null); + } + } final PageInfo page = mallUserActionService.listAsPage(userAction, pageNum, pageSize); return new ResultData(page); }