Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

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;
+
     /**
      * 获得积分值
      */

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-是',

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml

@@ -13,6 +13,7 @@
         <result property="upLimit" column="UP_LIMIT"/>
         <result property="upLimitDesc" column="UP_LIMIT_DESC"/>
         <result property="upLimitPrefix" column="UP_LIMIT_PREFIX"/>
+        <result property="rulePeriod" column="RULE_PERIOD"/>
         <result property="point" column="POINT"/>
         <result property="pointUnit" column="POINT_UNIT"/>
         <result property="enabledFlag" column="ENABLED_FLAG"/>

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 # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.96</version>
+    <version>0.0.97</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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);