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

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.25
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

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

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.23</version>
+    <version>0.0.25</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dao.UserPointActionLogDao;
 import com.epmet.dto.UserPointActionLogDTO;
@@ -43,6 +44,7 @@ import com.epmet.service.UserPointStatisticalDailyService;
 import com.epmet.service.UserPointTotalService;
 import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
+import com.epmet.utils.RuleCycleEnum;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import dto.form.SendPointFormDTO;
@@ -55,6 +57,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -193,23 +196,57 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         PointRuleEntity ruleInfo = pointRuleService.getByEventCodeAndCustomerId(event.getCustomerId(),eventCode);
         if(null != ruleInfo && StringUtils.equals(NumConstant.ONE_STR,ruleInfo.getEnabledFlag())){
             Date dateCheck = null;
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.set(Calendar.HOUR_OF_DAY, NumConstant.ZERO);
+            calendar.set(Calendar.MINUTE, NumConstant.ZERO);
+            calendar.set(Calendar.SECOND, NumConstant.ZERO);
+            //先判断周期，是否超过限值
+            RuleCycleEnum cycle = RuleCycleEnum.getEnum(ruleInfo.getRulePeriod());
+            switch(cycle){
+            //当周期为首次或无限制时，不需要传时间参数
+           //     case UNLIMITED:
+
+           //         break;
+           //     case FIRST:
+
+           //         break;
+                case DAILY:
+                    //今天零点
+                    dateCheck = calendar.getTime();
+                    break;
+                case WEEKLY:
+                    //本周第一天零点
+                    calendar.add(Calendar.WEEK_OF_MONTH, 0);
+                    calendar.set(Calendar.DAY_OF_WEEK, 2);
+                    dateCheck = calendar.getTime();
+                    break;
+                case MONTHLY:
+                    //本月第一天零点
+                    calendar.add(Calendar.MONTH, 0);
+                    calendar.set(Calendar.DAY_OF_MONTH, 1);
+                    dateCheck = calendar.getTime();
+                    break;
+                case YEARLY:
+                    //本年第一天零点
+                    int dayOfYear = Calendar.getInstance().get(Calendar.DAY_OF_YEAR);
+                    calendar.add(Calendar.DAY_OF_YEAR, -dayOfYear + 1);
+                    dateCheck = calendar.getTime();
+                    break;
+                default:
+            }
+
+
             //判断积分规则的积分单位 次、天、分钟、小时
-            if(StringUtils.equals(ModuleConstant.POINT_UNIT_TIME,ruleInfo.getPointUnit())){
-                //次
-            }else if(StringUtils.equals(ModuleConstant.POINT_UNIT_DAY,ruleInfo.getPointUnit())){
-                //天
-                //在selectSumByEvent时要校验时间区间
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(new Date());
-                calendar.set(Calendar.HOUR_OF_DAY, NumConstant.ZERO);
-                calendar.set(Calendar.MINUTE, NumConstant.ZERO);
-                calendar.set(Calendar.SECOND, NumConstant.ZERO);
-                dateCheck = calendar.getTime();
-            }else{
+            if(!StringUtils.equals(ModuleConstant.POINT_UNIT_TIME,ruleInfo.getPointUnit()) && !StringUtils.equals(ModuleConstant.POINT_UNIT_DAY,ruleInfo.getPointUnit())){
                 //其余积分单位
                 //TODO..
                 logger.warn(String.format("当前规则属于按%s计分，系统尚不支持响应此类积分规则的事件"),ruleInfo.getPointUnit());
+                return ;
             }
+
+
+
             //校验是否达到上限
             if(ruleInfo.getUpLimit() > NumConstant.ZERO){
                 //不按照sourceId查询，查询指定日期内的相关积分规则的总和
@@ -325,7 +362,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         action.setPoint(grantPoint.getPoint());
         action.setEventStatement(grantPoint.getRemark());
         action.setEventName(EventEnum.ACTIVE_SEND_POINT.getEventDesc());
-        action.setEventId(EventEnum.ACTIVE_INSERT_LIVE.getEventTag());
+        action.setEventId(ModuleConstant.COMMON_EVENT_ID);
         action.setActionFlag(grantPoint.getActionFlag());
         action.setUserId(grantPoint.getUserId());
         action.setCreatedBy(grantPoint.getOperatorId());
@@ -355,4 +392,5 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         userPointTotalService.insertOrUpdate(point);
     }
 
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -120,4 +120,9 @@ public interface ModuleConstant extends Constant {
     String EVENT_NAME_PARTICIPATED_ACT = "参与活动";
 
     String EVENT_NAME_ADD_LIVE = "添加活动实况";
+
+    /**
+     * 通用事件，不走规则，但也是事件，所以在用户积分行为记录表中的eventId中要有值，与积分调整、积分兑换分开
+     * */
+    String COMMON_EVENT_ID = "COMMON";
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/RuleCycleEnum.java

@@ -0,0 +1,41 @@
+package com.epmet.utils;
+
+
+/**
+ * 系统支持的规则周期枚举类
+ *
+ * @author wangc
+ * @date 2020-07-03 11:14
+ **/
+public enum RuleCycleEnum {
+
+    UNLIMITED("unlimit","不限制"),
+    FIRST("first","首次"),
+    DAILY("day","每日"),
+    WEEKLY("week","每周"),
+    MONTHLY("month","每月"),
+    YEARLY("year","每年")
+    ;
+
+    private String key;
+    private String desc;
+
+    RuleCycleEnum(String key,String desc){
+        this.key = key;
+        this.desc = desc;
+    }
+
+    public static RuleCycleEnum getEnum(String key){
+        RuleCycleEnum[] values = RuleCycleEnum.values();
+        for (RuleCycleEnum value : values) {
+            if (null != key && value.getKey().equals(key)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public String getKey(){ return key;}
+
+    public String getValue(){ return desc;}
+}

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

@@ -40,7 +40,7 @@
     </update>
 
     <select id="selectByEventCodeAndCustomerId" resultType="com.epmet.entity.PointRuleEntity">
-         SELECT ID,RULE_NAME,RULE_DESC,POINT,POINT_UNIT,ENABLED_FLAG,UP_LIMIT,OPERATE_TYPE
+         SELECT ID,RULE_NAME,RULE_DESC,POINT,POINT_UNIT,ENABLED_FLAG,UP_LIMIT,OPERATE_TYPE,RULE_PERIOD
          FROM point_rule
          WHERE
          DEL_FLAG = '0'

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.98
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.100
     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.98</version>
+    <version>0.0.100</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java

@@ -82,4 +82,8 @@ public interface PaConstant {
      * 更新客户Id信息失败
      */
     String UPDATE_CUSTOMER_EXCEPTION = "更新客户Id信息失败";
+    /**
+     * 更新客户初始化状态失败
+     */
+    String UPDATE_ISINITIALIZE_EXCEPTION = "更新客户初始化状态失败";
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -430,6 +430,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 authCodeDao.insertRedirectAuthCode(formDTO);
                 //authCode存缓存
                 redisThird.setAuthCode(formDTO);
+                this.authInfoByAuthCode(authCode, masterCustomerId, clientType);
 
                 log.info("=======================公众号的客户id为："+finalCustomerId);
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -90,6 +90,8 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     private CustomerMpService customerMpService;
     @Autowired
     private CpUserDetailRedis cpUserDetailRedis;
+    @Autowired
+    private PaCustomerDao paCustomerDao;
 
     @Override
     public PageData<PaCustomerDTO> page(Map<String, Object> params) {
@@ -533,6 +535,15 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             throw new RenException(PaConstant.UPDATE_CUSTOMER_EXCEPTION);
         }
 
+        //5.修改pa_customer表初始化状态
+        PaCustomerDTO paCustomer = new PaCustomerDTO();
+        paCustomer.setIsInitialize(NumConstant.ONE);
+        paCustomer.setId(formDTO.getNewCustomerId());
+        if (paCustomerDao.updateCustomerById(paCustomer) < NumConstant.ONE){
+            logger.error(String.format("修改pa_customer表初始化状态失败，待修改初始化状态的客户Id为->%s", paCustomer.getId()));
+            throw new RenException(PaConstant.UPDATE_ISINITIALIZE_EXCEPTION);
+        }
+
     }
 
 }

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.59
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.60
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.59</version>
+    <version>0.3.60</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>

epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.18
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.19
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络

epmet-module/resi-guide/resi-guide-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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.18</version>
+    <version>0.3.19</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -307,9 +307,10 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      * @param appId
      * @author zxc
      */
-    public PaCustomerDTO getCustomerInfo(String appId){
+    public PaCustomerDTO getCustomerInfo(String appId) {
         JSONObject jsonObject = new JSONObject();
         String data = HttpClientManager.getInstance().sendPostByJSON(GuideHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData();
+        logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:" + GuideHttpUrlConstant.CUSTOMER_MSG_URL + "，结果->" + data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
         if (!mapToResult.success()) {
@@ -318,8 +319,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
         }
         Object PublicCustomerResultDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
-        PublicCustomerResultDTO publicCustomerResultDTO = ConvertUtils.mapToEntity(json, PublicCustomerResultDTO.class);
-        PaCustomerDTO customer  = publicCustomerResultDTO.getCustomer();
+        Map<String, Object> map = (Map) json.get("customer");
+        PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
+        logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);
         return customer;
     }