优化发票上传功能

java110-bean/src/main/java/com/java110/dto/invoiceApply/InvoiceApplyDto.java

@@ -37,6 +37,8 @@ public class InvoiceApplyDto extends OwnerInvoiceDto implements Serializable {
     private String stateName;
     private String communityId;
 
+    private String invoiceCode;
+
 
     private Date createTime;
 
@@ -165,4 +167,12 @@ public class InvoiceApplyDto extends OwnerInvoiceDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getInvoiceCode() {
+        return invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
 }

java110-bean/src/main/java/com/java110/po/invoiceApply/InvoiceApplyPo.java

@@ -41,6 +41,8 @@ public class InvoiceApplyPo implements Serializable {
     private String state;
     private String communityId;
 
+    private String invoiceCode;
+
     public String getApplyId() {
         return applyId;
     }
@@ -137,5 +139,11 @@ public class InvoiceApplyPo implements Serializable {
         this.communityId = communityId;
     }
 
+    public String getInvoiceCode() {
+        return invoiceCode;
+    }
 
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java

@@ -54,6 +54,7 @@ public class PhotoSMOImpl implements IPhotoSMO {
 
         FileRelDto fileRelDto = new FileRelDto();
         fileRelDto.setObjId(objId);
+
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
 
         if(fileRelDtos == null || fileRelDtos.size()< 1){

java110-db/src/main/resources/mapper/acct/InvoiceApplyV1ServiceDaoImplMapper.xml

@@ -22,7 +22,7 @@
         invoiceType,t.apply_tel,t.apply_tel applyTel,t.invoice_amount,t.invoice_amount
         invoiceAmount,t.create_user_name,t.create_user_name createUserName,t.remark,t.status_cd,t.status_cd
         statusCd,t.state,t.community_id,t.community_id communityId,oi.invoice_name invoiceName,oi.invoice_num invoiceNum,oi.invoice_address invoiceAddress,
-        td.`name` stateName
+        td.`name` stateName,t.invoice_code invoiceCode,t.create_time createTime
         from invoice_apply t
         left join owner_invoice oi on t.oi_id = oi.oi_id
         left join t_dict td on t.state = td.status_cd and td.table_name = 'invoice_apply' and td.table_columns = 'state'
@@ -30,6 +30,9 @@
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
+        <if test="invoiceCode !=null and invoiceCode != ''">
+            and t.invoice_code= #{invoiceCode}
+        </if>
         <if test="oiId !=null and oiId != ''">
             and t.oi_id= #{oiId}
         </if>
@@ -104,13 +107,18 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
+        <if test="invoiceCode !=null and invoiceCode != ''">
+            , t.invoice_code= #{invoiceCode}
         </if>
+
+
         where 1=1
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
@@ -122,6 +130,9 @@
         <if test="applyId !=null and applyId != ''">
             and t.apply_id= #{applyId}
         </if>
+        <if test="invoiceCode !=null and invoiceCode != ''">
+            and t.invoice_code= #{invoiceCode}
+        </if>
         <if test="oiId !=null and oiId != ''">
             and t.oi_id= #{oiId}
         </if>

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

@@ -15,6 +15,7 @@
  */
 package com.java110.acct.cmd.invoice;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.acct.dao.IInvoiceEventV1ServiceDao;
 import com.java110.core.annotation.Java110Cmd;
@@ -68,6 +69,7 @@ public class AuditInvoiceApplyCmd extends Cmd {
     @Autowired
     private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
 
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
@@ -111,9 +113,9 @@ public class AuditInvoiceApplyCmd extends Cmd {
         invoiceEventPo.setCommunityId(reqJson.getString("communityId"));
         invoiceEventPo.setEventId(GenerateCodeFactory.getGeneratorId("11"));
         if ("1100".equals(reqJson.getString("state"))) {
-            invoiceEventPo.setEventType(InvoiceApplyDto.STATE_COMPLETE);
+            invoiceEventPo.setEventType(InvoiceEventDto.STATE_COMPLETE);
         }else{
-            invoiceEventPo.setEventType(InvoiceApplyDto.STATE_FAIL);
+            invoiceEventPo.setEventType(InvoiceEventDto.STATE_FAIL);
         }
         invoiceEventPo.setCreateUserId(userId);
         invoiceEventPo.setCreateUserName(userDtos.get(0).getName());

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

@@ -103,12 +103,12 @@ public class ListInvoiceApplyCmd extends Cmd {
         fileRelDto.setObjId(invoiceApplyDtos.get(0).getApplyId());
         fileRelDto.setRelTypeCd(FileRelDto.REL_TYPE_CE_INVOICE); //业主照片
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
-        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
+        //String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN, "IMG_PATH");
 
-        if (fileRelDtos != null && fileRelDtos.size() > 0) {
+        if (fileRelDtos != null && !fileRelDtos.isEmpty()) {
             List<String> urls = new ArrayList<>();
             for (FileRelDto fileRel : fileRelDtos) {
-                urls.add(imgUrl + fileRel.getFileRealName());
+                urls.add(fileRel.getFileRealName());
             }
             invoiceApplyDtos.get(0).setUrls(urls);
         }

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

@@ -0,0 +1,162 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.acct.cmd.invoice;
+
+import com.alibaba.fastjson.JSONArray;
+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.file.FileRelDto;
+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.common.IFileRelInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.file.FileRelPo;
+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.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+
+/**
+ * 类表述：上传发票
+ * 服务编码：invoiceApply.updateInvoiceApply
+ * 请求路劲：/app/invoiceApply.UpdateInvoiceApply
+ * add by 吴学文 at 2023-10-08 16:26:34 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "invoice.uploadInvoicePhoto")
+public class UploadInvoicePhotoCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(UploadInvoicePhotoCmd.class);
+
+
+    @Autowired
+    private IInvoiceApplyV1InnerServiceSMO invoiceApplyV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IInvoiceEventV1InnerServiceSMO invoiceEventV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "applyId", "applyId不能为空");
+        Assert.hasKeyAndValue(reqJson, "invoiceCode", "发票号不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户未登录");
+
+        InvoiceApplyDto invoiceApplyDto = new InvoiceApplyDto();
+        invoiceApplyDto.setApplyId(reqJson.getString("applyId"));
+        invoiceApplyDto.setCommunityId(reqJson.getString("communityId"));
+        List<InvoiceApplyDto> invoiceApplyDtos = invoiceApplyV1InnerServiceSMOImpl.queryInvoiceApplys(invoiceApplyDto);
+
+        Assert.listOnlyOne(invoiceApplyDtos, "发票申请不存在");
+
+
+        //todo 修改发票号
+        InvoiceApplyPo invoiceApplyPo = new InvoiceApplyPo();
+        invoiceApplyPo.setApplyId(reqJson.getString("applyId"));
+        invoiceApplyPo.setInvoiceCode(reqJson.getString("invoiceCode"));
+        if (InvoiceApplyDto.STATE_UPLOAD.equals(invoiceApplyDtos.get(0).getState())) {
+            invoiceApplyPo.setState(InvoiceApplyDto.STATE_GET);
+        }
+        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"));
+        invoiceEventPo.setEventType(InvoiceEventDto.STATE_UPLOAD);
+        invoiceEventPo.setCreateUserId(userId);
+        invoiceEventPo.setCreateUserName(userDtos.get(0).getName());
+        invoiceEventPo.setRemark("上传发票，发票号：" + reqJson.getString("invoiceCode"));
+        invoiceEventV1InnerServiceSMOImpl.saveInvoiceEvent(invoiceEventPo);
+
+        //todo 保存图片
+        if (!reqJson.containsKey("photos")) {
+            return;
+        }
+
+        JSONArray photos = reqJson.getJSONArray("photos");
+
+        if (photos == null || photos.isEmpty()) {
+            return;
+        }
+
+        FileRelPo fileRelPo = new FileRelPo();
+        fileRelPo.setObjId(reqJson.getString("applyId"));
+        fileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CE_INVOICE);
+        fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
+
+        FileRelPo tmpFileRelPo = null;
+        for (int photoIndex = 0; photoIndex < photos.size(); photoIndex++) {
+            tmpFileRelPo = new FileRelPo();
+            tmpFileRelPo.setObjId(reqJson.getString("applyId"));
+            tmpFileRelPo.setRelTypeCd(FileRelDto.REL_TYPE_CE_INVOICE);
+            tmpFileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+            tmpFileRelPo.setSaveWay("OSS");
+            tmpFileRelPo.setFileRealName(photos.getString(photoIndex));
+            tmpFileRelPo.setFileSaveName(photos.getString(photoIndex));
+            fileRelInnerServiceSMOImpl.saveFileRel(tmpFileRelPo);
+        }
+
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+    }
+
+}