用户积分日统计、工作人员核销日统计、用户总积分添加索引

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

@@ -4,8 +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.PointVerificationStatisticalDailyEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.entity.UserPointTotalEntity;
+import com.epmet.service.PointVerificationStatisticalDailyService;
 import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +33,10 @@ public class TestController {
     private LoginUserUtil loginUserUtil;
     @Autowired
     private UserPointStatisticalDailyService userPointStatisticalDailyService;
+    @Autowired
+    private PointVerificationStatisticalDailyService pointVerificationStatisticalDailyService;
+    @Autowired
+    private UserPointTotalService userPointTotalService;
     @GetMapping("test")
     public Result test(@LoginUser TokenDto tokenDto){
         Map map=new HashMap<>();
@@ -49,5 +57,15 @@ public class TestController {
         userPointStatisticalDailyService.test(entity);
         return new Result();
     }
+    @PostMapping("testunixkeyverification")
+    public Result testUnixKeyVerification(@RequestBody PointVerificationStatisticalDailyEntity entity){
+        pointVerificationStatisticalDailyService.testUnixKey(entity);
+        return new Result();
+    }
+    @PostMapping("testtotal")
+    public Result testTotal(@RequestBody UserPointTotalEntity entity){
+        userPointTotalService.testInsertOrUpdate(entity);
+        return new Result();
+    }
 }
 

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

@@ -39,4 +39,6 @@ public interface PointVerificationStatisticalDailyDao extends BaseDao<PointVerif
      * @date 2020.07.27 17:37
     **/
     PointVerificationStatisticalDailyEntity selectIfExisted(@Param("createdBy") String createdBy, @Param("dateId") String dateId);
+
+    void insertOrUpdate(PointVerificationStatisticalDailyEntity entity);
 }

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

@@ -62,4 +62,6 @@ public interface UserPointTotalDao extends BaseDao<UserPointTotalEntity> {
     **/
     UserPointTotalEntity selectIfExisted(@Param("userId") String userId);
 
+
+    void insertOrUpdate(UserPointTotalEntity userPointTotalEntity);
 }

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

@@ -101,4 +101,6 @@ public interface PointVerificationStatisticalDailyService extends BaseService<Po
      * @date 2020.07.27 17:28
     **/
     void insertOrUpdate(PointVerificationStatisticalDailyEntity entity);
+
+    void testUnixKey(PointVerificationStatisticalDailyEntity entity);
 }

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

@@ -123,4 +123,6 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
      * @date 2020.07.27 16:45
     **/
     void insertOrUpdate(UserPointTotalEntity entity);
+
+    void testInsertOrUpdate(UserPointTotalEntity entity);
 }

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

@@ -330,6 +330,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         statistical.setMonthId(dim.getMonthId());
         statistical.setQuarterId(dim.getQuarterId());
         statistical.setYearId(dim.getYearId());
+        statistical.setCreatedBy(verificationParam.getOperatorId());
         pointVerificationStatisticalDailyService.insertOrUpdate(statistical);
         //5.更新用户总积分表
         UserPointTotalEntity userPoint = new UserPointTotalEntity();

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

@@ -106,13 +106,20 @@ public class PointVerificationStatisticalDailyServiceImpl extends BaseServiceImp
      **/
     @Override
     public void insertOrUpdate(PointVerificationStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
+        /*
         PointVerificationStatisticalDailyEntity existed = baseDao.selectIfExisted(entity.getCreatedBy(),entity.getDateId());
         if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setVerificatedPoint(null == existed.getVerificatedPoint() ? entity.getVerificatedPoint() : existed.getVerificatedPoint() + entity.getVerificatedPoint());
             updateById(existed);
         }else{
             insert(entity);
-        }
+        }*/
+    }
+
+    @Override
+    public void testUnixKey(PointVerificationStatisticalDailyEntity entity) {
+        baseDao.insertOrUpdate(entity);
     }
 
 }

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

@@ -226,6 +226,8 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public void insertOrUpdate(UserPointTotalEntity entity) {
+        baseDao.insertOrUpdate(entity);
+        /*
         UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
         if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setUsedPoint(null == existed.getUsedPoint() ? entity.getUsedPoint() : entity.getUsedPoint() + existed.getUsedPoint());
@@ -234,7 +236,12 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
             updateById(existed);
         }else{
             insert(entity);
-        }
+        }*/
+    }
+
+    @Override
+    public void testInsertOrUpdate(UserPointTotalEntity entity) {
+        baseDao.insertOrUpdate(entity);
     }
 
 }

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

@@ -38,4 +38,49 @@
             created_by = #{createdBy}
     </select>
 
+
+
+    <insert id="insertOrUpdate" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.entity.PointVerificationStatisticalDailyEntity">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            SELECT replace(uuid(),'-','') AS ID
+        </selectKey>
+        INSERT INTO point_verification_statistical_daily
+        (
+            id,
+            date_id,
+            week_id,
+            month_id,
+            quarter_id,
+            year_id,
+            customer_id,
+            verificated_point,
+            agency_id,
+            pid,
+            pids,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        ) VALUE (
+            #{id},
+            #{dateId},
+            #{weekId},
+            #{monthId},
+            #{quarterId},
+            #{yearId},
+            #{customerId},
+            #{verificatedPoint},
+            #{agencyId},
+            #{pid},
+            #{pids},
+            #{createdBy},
+            now(),
+            #{createdBy},
+            now()
+        ) ON DUPLICATE KEY UPDATE
+        VERIFICATED_POINT = (VERIFICATED_POINT + #{verificatedPoint}),
+        UPDATED_TIME = NOW(),
+        UPDATED_BY = #{createdBy}
+    </insert>
+
 </mapper>

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

@@ -59,4 +59,39 @@
              user_id = #{userId}
     </select>
 
+    <insert id="insertOrUpdate" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.epmet.entity.UserPointTotalEntity">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            SELECT replace(uuid(),'-','') AS ID
+        </selectKey>
+        INSERT INTO user_point_total
+        (
+            id,
+            user_id,
+            customer_id,
+            used_point,
+            usable_point,
+            total_point,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        ) VALUE (
+            #{id},
+            #{userId},
+            #{customerId},
+            #{usedPoint},
+            #{usablePoint},
+            #{totalPoint},
+            #{createdBy},
+            now(),
+            #{createdBy},
+            now()
+        ) ON DUPLICATE KEY UPDATE
+        USED_POINT = (USED_POINT + #{usedPoint}),
+        USABLE_POINT = (USABLE_POINT + #{usablePoint}),
+        TOTAL_POINT = (TOTAL_POINT + #{totalPoint}),
+        UPDATED_TIME = NOW(),
+        UPDATED_BY = #{createdBy}
+    </insert>
+
 </mapper>