优化代码

java110-bean/src/main/java/com/java110/dto/invoiceEvent/InvoiceEventDto.java

@@ -15,6 +15,13 @@ import java.util.Date;
  **/
 public class InvoiceEventDto extends PageDto implements Serializable {
 
+
+    public static final String STATE_COMPLETE = "1001";// 类型 1001 审核成功 2002 上传 3003 审核失败 4004 领用 5005 登记
+    public static final String STATE_UPLOAD = "2002";//类型 1001 审核成功 2002 上传 3003 审核失败 4004 领用 5005 登记
+    public static final String STATE_FAIL = "3003";//类型 1001 审核成功 2002 上传 3003 审核失败 4004 领用 5005 登记
+    public static final String STATE_GET = "4004";//类型 1001 审核成功 2002 上传 3003 审核失败 4004 领用 5005 登记
+    public static final String STATE_GET_FINISH = "5005";//类型 1001 审核成功 2002 上传 3003 审核失败 4004 领用 5005 登记
+
     private String eventId;
     private String applyId;
     private String createUserId;

service-acct/src/main/java/com/java110/acct/cmd/invoice/UpdateInvoiceApplyCmd.java

@@ -16,13 +16,22 @@
 package com.java110.acct.cmd.invoice;
 
 import com.alibaba.fastjson.JSONObject;
+import com.java110.acct.dao.IInvoiceEventV1ServiceDao;
 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.invoiceApply.InvoiceApplyDto;
+import com.java110.dto.invoiceEvent.InvoiceEventDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IInvoiceApplyV1InnerServiceSMO;
+import com.java110.intf.acct.IInvoiceEventV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.invoiceApply.InvoiceApplyPo;
+import com.java110.po.invoiceEvent.InvoiceEventPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,9 +40,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
- * 类表述：更新
+ * 类表述：审核发票
  * 服务编码：invoiceApply.updateInvoiceApply
  * 请求路劲：/app/invoiceApply.UpdateInvoiceApply
  * add by 吴学文 at 2023-10-08 16:26:34 mail: 928255095@qq.com
@@ -42,18 +53,27 @@ import org.slf4j.LoggerFactory;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "invoice.updateInvoiceApply")
-public class UpdateInvoiceApplyCmd extends Cmd {
+@Java110Cmd(serviceCode = "invoice.auditInvoiceApply")
+public class AuditInvoiceApplyCmd extends Cmd {
 
-    private static Logger logger = LoggerFactory.getLogger(UpdateInvoiceApplyCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(AuditInvoiceApplyCmd.class);
 
 
     @Autowired
     private IInvoiceApplyV1InnerServiceSMO invoiceApplyV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IInvoiceEventV1InnerServiceSMO invoiceEventV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
+        Assert.hasKeyAndValue(reqJson, "state", "状态不能为空");
+        Assert.hasKeyAndValue(reqJson, "remark", "说明不能为空");
+
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
@@ -62,13 +82,44 @@ public class UpdateInvoiceApplyCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-        InvoiceApplyPo invoiceApplyPo = BeanConvertUtil.covertBean(reqJson, InvoiceApplyPo.class);
+        String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户未登录");
+
+
+        InvoiceApplyPo invoiceApplyPo = new InvoiceApplyPo();
+        invoiceApplyPo.setApplyId(reqJson.getString("applyId"));
+        //退费审核通过
+        if ("1100".equals(reqJson.getString("state"))) {
+            invoiceApplyPo.setState(InvoiceApplyDto.STATE_UPLOAD);
+        }else{
+            invoiceApplyPo.setState(InvoiceApplyDto.STATE_FAIL);
+        }
         int flag = invoiceApplyV1InnerServiceSMOImpl.updateInvoiceApply(invoiceApplyPo);
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
 
+        // todo 保存事件
+        InvoiceEventPo invoiceEventPo = new InvoiceEventPo();
+        invoiceEventPo.setApplyId(reqJson.getString("applyId"));
+        invoiceEventPo.setCommunityId(reqJson.getString("communityId"));
+        invoiceEventPo.setEventId(GenerateCodeFactory.getGeneratorId("11"));
+        if ("1100".equals(reqJson.getString("state"))) {
+            invoiceEventPo.setEventType(InvoiceApplyDto.STATE_COMPLETE);
+        }else{
+            invoiceEventPo.setEventType(InvoiceApplyDto.STATE_FAIL);
+        }
+        invoiceEventPo.setCreateUserId(userId);
+        invoiceEventPo.setCreateUserName(userDtos.get(0).getName());
+        invoiceEventPo.setRemark(reqJson.getString("remark"));
+        invoiceEventV1InnerServiceSMOImpl.saveInvoiceEvent(invoiceEventPo);
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }