优化代码

java110-db/src/main/resources/mapper/store/ComplaintEventV1ServiceDaoImplMapper.xml

@@ -5,120 +5,118 @@
 <mapper namespace="complaintEventV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存投诉事件信息 add by wuxw 2018-07-03 -->
     <insert id="saveComplaintEventInfo" parameterType="Map">
         insert into complaint_event(
-event_id,create_user_id,complaint_id,create_user_name,remark,event_type,community_id
-) values (
-#{eventId},#{createUserId},#{complaintId},#{createUserName},#{remark},#{eventType},#{communityId}
-)
+        event_id,create_user_id,complaint_id,create_user_name,remark,event_type,community_id
+        ) values (
+        #{eventId},#{createUserId},#{complaintId},#{createUserName},#{remark},#{eventType},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询投诉事件信息 add by wuxw 2018-07-03 -->
     <select id="getComplaintEventInfo" parameterType="Map" resultType="Map">
-        select  t.event_id,t.event_id eventId,t.create_user_id,t.create_user_id createUserId,t.complaint_id,t.complaint_id complaintId,t.create_user_name,t.create_user_name createUserName,t.remark,t.status_cd,t.status_cd statusCd,t.event_type,t.event_type eventType,t.community_id,t.community_id communityId 
-from complaint_event t 
-where 1 =1 
-<if test="eventId !=null and eventId != ''">
-   and t.event_id= #{eventId}
-</if> 
-<if test="createUserId !=null and createUserId != ''">
-   and t.create_user_id= #{createUserId}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="createUserName !=null and createUserName != ''">
-   and t.create_user_name= #{createUserName}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="eventType !=null and eventType != ''">
-   and t.event_type= #{eventType}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.event_id,t.event_id eventId,t.create_user_id,t.create_user_id
+        createUserId,t.complaint_id,t.complaint_id complaintId,t.create_user_name,t.create_user_name
+        createUserName,t.remark,t.status_cd,t.status_cd statusCd,t.event_type,t.event_type
+        eventType,t.community_id,t.community_id communityId,t.create_time createTime
+        from complaint_event t
+        where 1 =1
+        <if test="eventId !=null and eventId != ''">
+            and t.event_id= #{eventId}
+        </if>
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name= #{createUserName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="eventType !=null and eventType != ''">
+            and t.event_type= #{eventType}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改投诉事件信息 add by wuxw 2018-07-03 -->
     <update id="updateComplaintEventInfo" parameterType="Map">
-        update  complaint_event t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="createUserId !=null and createUserId != ''">
-, t.create_user_id= #{createUserId}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-, t.complaint_id= #{complaintId}
-</if> 
-<if test="createUserName !=null and createUserName != ''">
-, t.create_user_name= #{createUserName}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="eventType !=null and eventType != ''">
-, t.event_type= #{eventType}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="eventId !=null and eventId != ''">
-and t.event_id= #{eventId}
-</if> 
+        update complaint_event t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="createUserId !=null and createUserId != ''">
+            , t.create_user_id= #{createUserId}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            , t.complaint_id= #{complaintId}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            , t.create_user_name= #{createUserName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="eventType !=null and eventType != ''">
+            , t.event_type= #{eventType}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="eventId !=null and eventId != ''">
+            and t.event_id= #{eventId}
+        </if>
 
     </update>
 
     <!-- 查询投诉事件数量 add by wuxw 2018-07-03 -->
-     <select id="queryComplaintEventsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from complaint_event t 
-where 1 =1 
-<if test="eventId !=null and eventId != ''">
-   and t.event_id= #{eventId}
-</if> 
-<if test="createUserId !=null and createUserId != ''">
-   and t.create_user_id= #{createUserId}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="createUserName !=null and createUserName != ''">
-   and t.create_user_name= #{createUserName}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="eventType !=null and eventType != ''">
-   and t.event_type= #{eventType}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryComplaintEventsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from complaint_event t
+        where 1 =1
+        <if test="eventId !=null and eventId != ''">
+            and t.event_id= #{eventId}
+        </if>
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name= #{createUserName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="eventType !=null and eventType != ''">
+            and t.event_type= #{eventType}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-store/src/main/java/com/java110/store/cmd/complaintAppraise/UpdateComplaintAppraiseCmd.java

@@ -18,11 +18,14 @@ package com.java110.store.cmd.complaintAppraise;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.complaintAppraise.ComplaintAppraiseDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.store.IComplaintAppraiseV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.complaintAppraise.ComplaintAppraisePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -32,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -43,19 +48,23 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "complaintAppraise.updateComplaintAppraise")
-public class UpdateComplaintAppraiseCmd extends Cmd {
+@Java110Cmd(serviceCode = "complaintAppraise.replyComplaintAppraise")
+public class ReplyComplaintAppraiseCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateComplaintAppraiseCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ReplyComplaintAppraiseCmd.class);
 
 
     @Autowired
     private IComplaintAppraiseV1InnerServiceSMO complaintAppraiseV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "appraiseId", "appraiseId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "replyContext", "回复内容不能为空");
 
     }
 
@@ -63,7 +72,19 @@ Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ComplaintAppraisePo complaintAppraisePo = BeanConvertUtil.covertBean(reqJson, ComplaintAppraisePo.class);
+        String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户未登录");
+
+
+        ComplaintAppraisePo complaintAppraisePo = BeanConvertUtil.covertBean(reqJson, ComplaintAppraisePo.class);
+        complaintAppraisePo.setState("C");
+        complaintAppraisePo.setReplyUserId(userDtos.get(0).getUserId());
+        complaintAppraisePo.setReplyUserName(userDtos.get(0).getName());
         int flag = complaintAppraiseV1InnerServiceSMOImpl.updateComplaintAppraise(complaintAppraisePo);
 
         if (flag < 1) {