Merge remote-tracking branch 'remotes/origin/dev' into release

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.37
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.38
     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.37</version>
+    <version>0.0.38</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/TestController.java

@@ -4,12 +4,12 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.service.UserPointStatisticalDailyService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,6 +27,8 @@ public class TestController {
     private Logger logger = LogManager.getLogger(TestController.class);
     @Autowired
     private LoginUserUtil loginUserUtil;
+    @Autowired
+    private UserPointStatisticalDailyService userPointStatisticalDailyService;
     @GetMapping("test")
     public Result test(@LoginUser TokenDto tokenDto){
         Map map=new HashMap<>();
@@ -42,5 +44,10 @@ public class TestController {
         result.setData("success");
         return result;
     }
+    @PostMapping("testinsert")
+    public Result testInsert(@RequestBody UserPointStatisticalDailyEntity entity){
+        userPointStatisticalDailyService.test(entity);
+        return new Result();
+    }
 }
 

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java

@@ -53,4 +53,13 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
      * @date 2020.07.27 16:20
     **/
     UserPointStatisticalDailyEntity selectIfExisted(@Param("userId") String userId,@Param("dateId") String dateId,@Param("actionFlag")String actionFlag);
+
+    /**
+     * @Description 新增或修改
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.08.11 17:40
+    **/
+    void insertOrUpdate(UserPointStatisticalDailyEntity entity);
 }

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

@@ -112,4 +112,6 @@ public interface UserPointStatisticalDailyService extends BaseService<UserPointS
      * @date 2020.07.27 16:10
     **/
     void insertOrUpdate(UserPointStatisticalDailyEntity entity);
+
+    void test(UserPointStatisticalDailyEntity entity);
 }

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

@@ -189,6 +189,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void grantPointByEvent(String eventCode,BasePointEventMsg event) {
+        
         if(!StringUtils.equals(EventEnum.REGISTER_VOLUNTEER.getEventTag(),eventCode) && !StringUtils.equals(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),eventCode)){
             logger.error(String.format("无法识别事件类型与积分规则，消息体->【%s】", JSON.toJSON(event)));
             throw new RenException("无法识别事件类型与积分规则");

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

@@ -210,13 +210,20 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
      **/
     @Override
     public void insertOrUpdate(UserPointStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
+        /*
         UserPointStatisticalDailyEntity existed = baseDao.selectIfExisted(entity.getUserId(),entity.getDateId(),entity.getActionFlag());
         if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setPointChange(null == existed.getPointChange() ? entity.getPointChange() : existed.getPointChange() + entity.getPointChange());
             updateById(existed);
         }else{
             insert(entity);
-        }
+        }*/
+    }
+
+    @Override
+    public void test(UserPointStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
     }
 
 

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.2__unixKey.sql

@@ -0,0 +1 @@
+ALTER TABLE user_point_statistical_daily ADD UNIQUE USER_DATE_ACTION(USER_ID,DATE_ID,ACTION_FLAG,CUSTOMER_ID);

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

@@ -54,7 +54,7 @@
         AND ( daily.ACTION_FLAG = 'plus' OR daily.ACTION_FLAG = 'minus' )
         WHERE
         total.DEL_FLAG = '0'
-        AND total.DEL_FLAG = '0'
+        AND total.CUSTOMER_ID = #{customerId}
         GROUP BY
         total.USER_ID
         ORDER BY
@@ -80,4 +80,54 @@
              action_flag = #{actionFlag}
     </select>
 
+
+    <insert id="insertOrUpdate" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.entity.UserPointStatisticalDailyEntity">
+
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            SELECT replace(uuid(),'-','') AS ID
+        </selectKey>
+
+        INSERT INTO user_point_statistical_daily
+        (
+                id,
+                user_id,
+                date_id,
+                week_id,
+                month_id,
+                quarter_id,
+                year_id,
+                action_flag,
+                customer_id,
+                point_change,
+                del_flag,
+                revision,
+                created_by,
+                created_time,
+                updated_by,
+                updated_time
+        ) VALUE (
+                #{id},
+                #{userId},
+                #{dateId},
+                #{weekId},
+                #{monthId},
+                #{quarterId},
+                #{yearId},
+                #{actionFlag},
+                #{customerId},
+                #{pointChange},
+                '1',
+                0,
+                #{createdBy},
+                now(),
+                #{createdBy},
+                now()
+
+        ) ON DUPLICATE KEY UPDATE
+        POINT_CHANGE = (POINT_CHANGE + #{pointChange}),
+        UPDATED_TIME = NOW(),
+        UPDATED_BY = #{createdBy}
+
+    </insert>
+
 </mapper>