From 9c72469971ac1ddb2c5242937e84fa67391228c7 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 17 Jun 2022 15:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PointApplyServiceImpl.java   | 49 +++++++++++--------
 .../main/resources/mapper/PointApplyDao.xml   |  2 +-
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java
index 33065999d5..692b626c02 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java
@@ -154,6 +154,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
      * @Date 2022/6/14 14:14
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void submit(PointApplyFormDTO formDTO) {
         PointApplyEntity entity = ConvertUtils.sourceToTarget(formDTO, PointApplyEntity.class);
         //从缓存获取网格信息
@@ -214,6 +215,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
      * @Date 2022/6/15 15:20
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void audit(TokenDto tokenDto, PointAuditFormDTO formDTO) {
         if (StringUtils.isBlank(formDTO.getId()) && CollectionUtils.isEmpty(formDTO.getIds())) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请选择待审核的申请", "请选择待审核的申请");
@@ -230,6 +232,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
             if (NumConstant.ZERO_STR.equals(dto.getStatus())) {
                 //更新审核状态
                 PointApplyEntity entity = ConvertUtils.sourceToTarget(formDTO, PointApplyEntity.class);
+                entity.setId(id);
                 baseDao.updateById(entity);
 
                 String subjectId;
@@ -244,31 +247,37 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
                 record.setCustomerId(tokenDto.getCustomerId());
                 record.setTitle(dto.getTitle());
                 record.setStatement(dto.getStatement());
-                record.setPointValue(dto.getPointValue());
+                if (NumConstant.TWO_STR.equals(formDTO.getStatus())) {
+                    record.setPointValue(dto.getPointValue());
+                } else {
+                    record.setPointValue(NumConstant.ZERO);
+                }
                 record.setCategoryCode(dto.getCategoryCode());
                 record.setSubjectId(subjectId);
                 record.setBusinessId(dto.getId());
                 record.setBusinessCode(CommonConstant.POINT_APPLY);
                 pointAditiveRecordDao.insert(record);
-                //重新计算总分
-                LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
-                wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId);
-                wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode());
-                PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper);
-                if (null != calc) {
-                    calc.setUpdatedBy(null);
-                    calc.setUpdatedTime(null);
-                    calc.setTotal(calc.getTotal() + dto.getPointValue());
-                    pointAditiveCalcDao.updateById(calc);
-                } else {
-                    calc = new PointAditiveCalcEntity();
-                    calc.setCustomerId(tokenDto.getCustomerId());
-                    calc.setCategoryCode(dto.getCategoryCode());
-                    calc.setSubjectId(subjectId);
-                    calc.setSpend(NumConstant.ZERO);
-                    calc.setTotal(dto.getPointValue());
-                    pointAditiveCalcDao.insert(calc);
+                if (NumConstant.TWO_STR.equals(formDTO.getStatus())) {
+                    //重新计算总分
+                    LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
+                    wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId);
+                    wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode());
+                    PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper);
+                    if (null != calc) {
+                        calc.setUpdatedBy(null);
+                        calc.setUpdatedTime(null);
+                        calc.setTotal(calc.getTotal() + dto.getPointValue());
+                        pointAditiveCalcDao.updateById(calc);
+                    } else {
+                        calc = new PointAditiveCalcEntity();
+                        calc.setCustomerId(tokenDto.getCustomerId());
+                        calc.setCategoryCode(dto.getCategoryCode());
+                        calc.setSubjectId(subjectId);
+                        calc.setSpend(NumConstant.ZERO);
+                        calc.setTotal(dto.getPointValue());
+                        pointAditiveCalcDao.insert(calc);
+                    }
                 }
             }
         });
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml
index 8aa8e7989a..08ca82bcf0 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml
@@ -51,7 +51,7 @@
         <result property="userId" column="USER_ID"/>
         <result property="createdTime" column="CREATED_TIME"/>
         <result property="ruleName" column="RULE_NAME"/>
-        <result property="pointValue" column="POINT"/>
+        <result property="pointValue" column="POINT_VALUE"/>
         <collection property="annexList" ofType="java.lang.String">
             <result column="URL"/>
         </collection>