Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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

@@ -32,4 +32,8 @@ public class FinishResultDTO implements Serializable {
     private String remark;
     private String firstCategoryName;
     private String categoryCode;
+    /**
+     * 完成结果：已解决 resolved，未解决 unresolved
+     */
+    private String finishResult;
 }

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

@@ -204,7 +204,10 @@ public class IcUserDemandRecController {
                 form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
                 form.setContent(mqMsg);
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
-            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && null != finishResultDTO.getAwardPoint() && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
+            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType())
+                    && null != finishResultDTO.getAwardPoint()
+                    && finishResultDTO.getAwardPoint() > NumConstant.ZERO
+                    && UserDemandConstant.RESOLVED.equals(finishResultDTO.getFinishResult())) {
                 // 志愿者发放积分
                 List<BasePointEventMsg> actPointEventMsgList = new ArrayList<>();
                 BasePointEventMsg actPointEventMsg = new BasePointEventMsg();

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

@@ -144,7 +144,10 @@ public class ResiDemandController {
                 form.setMessageType(SystemMessageType.CAL_PARTY_UNIT_SATISFACTION);
                 form.setContent(mqMsg);
                 epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
-            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType()) && null != finishResultDTO.getAwardPoint() && finishResultDTO.getAwardPoint() > NumConstant.ZERO) {
+            } else if (UserDemandConstant.VOLUNTEER.equals(finishResultDTO.getServiceType())
+                    && null != finishResultDTO.getAwardPoint()
+                    && finishResultDTO.getAwardPoint() > NumConstant.ZERO
+                    && UserDemandConstant.RESOLVED.equals(finishResultDTO.getFinishResult())) {
                 // 志愿者发放积分
                 List<BasePointEventMsg> actPointEventMsgList = new ArrayList<>();
                 BasePointEventMsg actPointEventMsg = new BasePointEventMsg();

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

@@ -232,6 +232,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         HouseInfoDTO houseInfoDTO=houseInfoRes.getData().get(NumConstant.ZERO);
         insertEntity.setServiceLocation(houseInfoDTO.getNeighborAddress().
                 concat(houseInfoDTO.getNeighborHoodName()));
+        insertEntity.setLocationDetail(houseInfoDTO.getBuildingName().concat(StrConstant.HYPHEN).concat(houseInfoDTO.getUnitName()).concat(StrConstant.HYPHEN).concat(houseInfoDTO.getDoorName()));
         insertEntity.setLongitude(houseInfoDTO.getBuildingLongitude());
         insertEntity.setLatitude(houseInfoDTO.getBuildingLatitude());
         baseDao.insert(insertEntity);
@@ -465,6 +466,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             }
             String content = entity.getContent().length() > 100 ? entity.getContent().substring(0, 99) : entity.getContent();
             finishResultDTO.setRemark(String.format(UserDemandConstant.GRANT_POINT_REMARK,entity.getDemandUserName(),content));
+            finishResultDTO.setFinishResult(formDTO.getFinishResult());
         }
         baseDao.updateById(entity);
 
@@ -1106,6 +1108,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         String content = entity.getContent().length() > 100 ? entity.getContent().substring(0, 99) : entity.getContent();
         finishResultDTO.setRemark(String.format(UserDemandConstant.GRANT_POINT_REMARK,entity.getDemandUserName(),content));
         finishResultDTO.setCategoryCode(entity.getCategoryCode());
+        finishResultDTO.setFinishResult(formDTO.getFinishResult());
         //5、我的需求-评价：如果服务方是志愿者，通知它：  您收到来自XXX(需求人姓名)的评价，请查看。
         sendVolunnterEvaluated(entity);
         return finishResultDTO;