历史数据不发

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcUserDemandRecDTO.java

@@ -145,6 +145,11 @@ public class IcUserDemandRecDTO implements Serializable {
      */
 	private Boolean evaluateFlag;
 
+    /**
+     * 奖励积分
+     */
+    private Integer awardPoint;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */
@@ -175,4 +180,6 @@ public class IcUserDemandRecDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	private String serverId;
+	private String serviceType;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/FinishResultDTO.java

@@ -22,6 +22,10 @@ public class FinishResultDTO implements Serializable {
      */
     private Integer awardPoint;
 
+    /**
+     * 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录
+     */
+    private Boolean evaluateFlag;
     /**
      * 完成了XXX的需求
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -67,4 +67,11 @@ public interface EpmetHeartOpenFeignClient {
      */
     @PostMapping("/heart/resi/volunteer/page")
     Result<List<PageVolunteerInfoResultDTO>> queryVolunteerPage(@RequestBody VolunteerCommonFormDTO input);
+
+    /**
+     * 服务方填写实际服务时间，并点击确认后。 7天内需求人未作出评价，默认完成情况为已完成，五星好评，为服务方发放积分
+     * @return
+     */
+    @PostMapping("/heart/residemand/autoevaluate")
+    Result AutoEvaluateDemand();
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@@ -60,4 +60,14 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
     public Result<List<PageVolunteerInfoResultDTO>> queryVolunteerPage(VolunteerCommonFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "queryVolunteerPage", input);
     }
+
+    /**
+     * 服务方填写实际服务时间，并点击确认后。 7天内需求人未作出评价，默认完成情况为已完成，五星好评，为服务方发放积分
+     *
+     * @return
+     */
+    @Override
+    public Result AutoEvaluateDemand() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "autoEvaluate");
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java

@@ -193,6 +193,7 @@ public class IcUserDemandRecController {
         formDTO.setUserType(UserDemandConstant.STAFF);
         ValidatorUtils.validateEntity(formDTO,FinishStaffFromDTO.IcShowGroup.class,FinishStaffFromDTO.AddUserInternalGroup.class);
         FinishResultDTO finishResultDTO=icUserDemandRecService.finish(formDTO);
+        if(finishResultDTO.getEvaluateFlag()){
             //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
             if(UserDemandConstant.PARTY_UNIT.equals(finishResultDTO.getServiceType())){
                 ServerSatisfactionCalFormDTO mqMsg = new ServerSatisfactionCalFormDTO();
@@ -203,7 +204,7 @@ public class IcUserDemandRecController {
                 form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
                 form.setContent(mqMsg);
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
-        } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
+            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && null != finishResultDTO.getAwardPoint() && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
                 // 志愿者发放积分
                 List<BasePointEventMsg> actPointEventMsgList = new ArrayList<>();
                 BasePointEventMsg actPointEventMsg = new BasePointEventMsg();
@@ -228,6 +229,7 @@ public class IcUserDemandRecController {
                     log.error(String.format("demandRecId:%s,给志愿者发放积分失败", formDTO.getDemandRecId()));
                 }
             }
+        }
         return new Result();
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java

@@ -124,6 +124,7 @@ public class ResiDemandController {
         formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO, EvaluateDemandFormDTO.ShowGroup.class, EvaluateDemandFormDTO.AddUserInternalGroup.class);
         FinishResultDTO finishResultDTO = icUserDemandRecService.evaluate(formDTO);
+        if(finishResultDTO.getEvaluateFlag()){
             //如果服务方是区域化党建单位，需要实时去计算他的群众满意度=服务过的需求的评价分数相加➗ 需求的总个数。
             if (UserDemandConstant.PARTY_UNIT.equals(finishResultDTO.getServiceType())) {
                 ServerSatisfactionCalFormDTO mqMsg = new ServerSatisfactionCalFormDTO();
@@ -134,7 +135,7 @@ public class ResiDemandController {
                 form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
                 form.setContent(mqMsg);
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
-        } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
+            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && null != finishResultDTO.getAwardPoint() && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
                 // 志愿者发放积分
                 List<BasePointEventMsg> actPointEventMsgList = new ArrayList<>();
                 BasePointEventMsg actPointEventMsg = new BasePointEventMsg();
@@ -159,6 +160,7 @@ public class ResiDemandController {
                     log.error(String.format("需求评价完成：demandRecId:%s,给志愿者发放积分失败", formDTO.getDemandRecId()));
                 }
             }
+        }
         return new Result();
     }
 
@@ -242,4 +244,15 @@ public class ResiDemandController {
         ValidatorUtils.validateEntity(formDTO, UserDemandRelFormDTO.AddInternalGroup.class);
         return new Result<UserDemandRelResDTO>().ok(icUserDemandRecService.queryUserDemandRel(formDTO));
     }
+
+    /**
+     * 服务方填写实际服务时间，并点击确认后。 7天内需求人未作出评价，默认完成情况为已完成，五星好评，为服务方发放积分
+     *
+     * @return
+     */
+    @PostMapping("autoevaluate")
+    public Result autoEvaluate(){
+        icUserDemandRecService.autoEvaluate();
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcUserDemandRecDTO;
 import com.epmet.dto.form.demand.IcResiUserDemandFromDTO;
 import com.epmet.dto.form.demand.PageListAnalysisFormDTO;
 import com.epmet.dto.form.demand.UserDemandPageFormDTO;
@@ -111,4 +112,6 @@ public interface IcUserDemandRecDao extends BaseDao<IcUserDemandRecEntity> {
     List<ResiClientMyDemandResDTO> queryMyDemandForResiClient(@Param("gridId") String gridId,
                                                               @Param("type")String type,
                                                               @Param("demandUserId")String demandUserId);
+
+    List<IcUserDemandRecDTO> selectNoEvaluate();
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java

@@ -213,4 +213,9 @@ public interface IcUserDemandRecService extends BaseService<IcUserDemandRecEntit
      * @return
      */
     UserDemandRelResDTO queryUserDemandRel(UserDemandRelFormDTO formDTO);
+
+    /**
+     * 服务方填写实际服务时间，并点击确认后。 7天内需求人未作出评价，默认完成情况为已完成，五星好评，为服务方发放积分
+     */
+    void autoEvaluate();
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -421,6 +421,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         serviceEntity.setServiceEndTime(formDTO.getServiceEndTime());
         demandServiceDao.updateById(serviceEntity);
 
+        FinishResultDTO finishResultDTO=new FinishResultDTO();
+        finishResultDTO.setServerId(serviceEntity.getServerId());
+        finishResultDTO.setServiceType(serviceEntity.getServiceType());
         // 3、pc完成情况：完成+评价
         if(UserDemandConstant.FINISH_AND_EVALUATE.equals(formDTO.getType())){
             //3.1、插入评价得分记录
@@ -441,23 +444,23 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
 
             //3.5如果需求是志愿者完成的，发送消息：您收到来自XXX的评价，请查看。
             sendVolunnterEvaluated(entity);
-        }
-
-        //4、修改主表状态为已完成
-        entity.setStatus(UserDemandConstant.FINISHED);
-        baseDao.updateById(entity);
 
-        FinishResultDTO finishResultDTO=new FinishResultDTO();
-        finishResultDTO.setServerId(serviceEntity.getServerId());
-        finishResultDTO.setServiceType(serviceEntity.getServiceType());
             finishResultDTO.setAwardPoint(entity.getAwardPoint());
             finishResultDTO.setCategoryCode(entity.getCategoryCode());
+            finishResultDTO.setEvaluateFlag(entity.getEvaluateFlag());
             if(StringUtils.isBlank(entity.getParentCode())||NumConstant.ZERO_STR.equals(entity.getParentCode())){
                 finishResultDTO.setFirstCategoryName(demandDictService.getCategoryName(entity.getCustomerId(),entity.getCategoryCode()));
             }else{
                 finishResultDTO.setFirstCategoryName(demandDictService.getCategoryName(entity.getCustomerId(),entity.getParentCode()));
             }
             finishResultDTO.setRemark(String.format(UserDemandConstant.GRANT_POINT_REMARK,entity.getDemandUserName()));
+        }
+
+        //4、修改主表状态为已完成
+        entity.setStatus(UserDemandConstant.FINISHED);
+        baseDao.updateById(entity);
+
+
         // 5、如果是居民端用户提出的需求，发消息：您提出的需求已完成，请进行服务评价。
         sendDemandUserFinished(entity);
         return finishResultDTO;
@@ -1080,6 +1083,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         finishResultDTO.setServerId(serviceEntity.getServerId());
         finishResultDTO.setServiceType(serviceEntity.getServiceType());
         finishResultDTO.setAwardPoint(entity.getAwardPoint());
+        finishResultDTO.setEvaluateFlag(entity.getEvaluateFlag());
         if(StringUtils.isBlank(entity.getParentCode())||NumConstant.ZERO_STR.equals(entity.getParentCode())){
             finishResultDTO.setFirstCategoryName(demandDictService.getCategoryName(entity.getCustomerId(),entity.getCategoryCode()));
         }else{
@@ -1521,5 +1525,15 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         return res;
     }
+
+    /**
+     * 服务方填写实际服务时间，并点击确认后。 7天内需求人未作出评价，默认完成情况为已完成，五星好评，为服务方发放积分
+     */
+    @Override
+    public void autoEvaluate() {
+        // 查询完成后，超过7天未评价的记录
+        List<IcUserDemandRecDTO> list=baseDao.selectNoEvaluate();
+
+    }
 }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -496,4 +496,21 @@
             </if>
             order by r.WANT_SERVICE_TIME asc
     </select>
+
+    <select id="selectNoEvaluate" resultType="com.epmet.dto.IcUserDemandRecDTO">
+        SELECT
+            r.*,
+            s.SERVER_ID,
+            s.SERVICE_TYPE
+        FROM
+            ic_user_demand_rec r
+            INNER JOIN ic_user_demand_service s ON ( r.id = s.demand_rec_id )
+        WHERE
+            r.DEL_FLAG = '0'
+            AND r.`STATUS` = 'finished'
+            AND r.EVALUATE_FLAG = '0'
+            and s.SERVICE_START_TIME is not NULL
+            and s.SERVICE_END_TIME is not null
+            and timestampdiff(day,s.UPDATED_TIME,now()) &gt;7
+    </select>
 </mapper>

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

@@ -90,6 +90,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-heart-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoEvaluateDemandTask.java

@@ -0,0 +1,24 @@
+package com.epmet.task;
+
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author yinzuomei
+ * @dscription 每天晚上23:50执行，需求已完成，未评分的自动评分=》发放积分，计算满意度
+ */
+@Slf4j
+@Component("resiEventAutoAuditTask")
+public class AutoEvaluateDemandTask implements ITask {
+    @Autowired
+    private EpmetHeartOpenFeignClient heartOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        Result result = heartOpenFeignClient.AutoEvaluateDemand();
+    }
+}

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

@@ -589,19 +589,6 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             return;
         }
         list.forEach(grantPoint->{
-            if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,grantPoint.getActionFlag())){
-                //减
-                if(grantPoint.getPoint() > NumConstant.ZERO){
-                    //保证负数
-                    grantPoint.setPoint(grantPoint.getPoint() * NumConstant.ONE_NEG);
-                }
-            }else{
-                //加
-                if(grantPoint.getPoint() < NumConstant.ZERO){
-                    //保证正数
-                    grantPoint.setPoint(grantPoint.getPoint() * NumConstant.ONE_NEG);
-                }
-            }
             //1.新增用户积分行为记录
             UserPointActionLogEntity action = new UserPointActionLogEntity();
             action.setCustomerId(grantPoint.getCustomerId());