From ed649460a233f76a91c9e2b34819da98d250dd9a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 13:47:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=84=E5=88=99=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/PointRuleEntity.java | 5 +++++ .../src/main/resources/db/migration/epmet_point.sql | 1 + .../src/main/resources/mapper/PointRuleDao.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java index 47d84305a2..ce47c3ca40 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java @@ -82,6 +82,11 @@ public class PointRuleEntity extends BaseEpmetEntity { */ private String upLimitPrefix; + /** + * 上限积分计算周期；不限：unlimit；首次：first；天：day；月：周：week；month；年：year + */ + private String rulePeriod; + /** * 获得积分值 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql index de6294d923..88088724de 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql @@ -9,6 +9,7 @@ CREATE TABLE `point_rule` ( `UP_LIMIT` int(11) DEFAULT '-1' COMMENT '积分上限 -1表示不涉及积分上限；', `UP_LIMIT_DESC` varchar(64) DEFAULT NULL COMMENT '积分上限描述', `UP_LIMIT_PREFIX` varchar(64) DEFAULT '' COMMENT '积分示例中 积分上限前缀', + `RULE_PERIOD` varchar(32) DEFAULT NULL COMMENT '上限积分计算周期；不限：unlimit；首次：first；天：day；月：周：week；month；年：year', `POINT` int(11) DEFAULT '0' COMMENT '单位积分值', `POINT_UNIT` varchar(32) DEFAULT NULL COMMENT '获得积分单位 次：time；分钟：minute；小时：hour', `ENABLED_FLAG` varchar(1) DEFAULT '0' COMMENT '是否启用 0-否，1-是', diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml index f1001ae7d9..5171f21a59 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml @@ -13,6 +13,7 @@ + From 278a4430ba387f2c5ad69e78a2794e6ec972ec54 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 13:58:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2manager?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ComponentVerifyTicketServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index b61183c60a..0a513f7ae6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -397,6 +397,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe String expiresIn = authCodeAndTime.getExpiresIn(); // 公众号创建客户的id String customerId = this.getLoginUserCustomerId(tokenDto); + String userId = tokenDto.getUserId(); Date expiresInTime = this.countExpirationTime(expiresIn); @@ -438,7 +439,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe paCustomerServiceImpl.modifyCustomer(modifyCustomer); // 管理员授权 - CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(finalCustomerId); + CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId); log.info("=======================公众号的客户id为："+finalCustomerId); customerManager.setCustomerId(finalCustomerId); operCrmOpenFeignClient.addManager(customerManager); From e31ed06624162ecd3493fbd0a27c9b18a8b23e80 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 13:59:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 7a77861e44..781554e240 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.96 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.97 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index ff744344b3..a74dd6e761 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.96 + 0.0.97 com.epmet