Browse Source

账单推送增加上传发票

yanliming 4 years ago
parent
commit
1f55872221

+ 3 - 0
common/src/main/java/com/jpsoft/enterprise/modules/base/dto/BillDetailDTO.java

@@ -25,5 +25,8 @@ public class BillDetailDTO {
     @ApiModelProperty(value = "支付状态")
     private String payStatusN;
 
+    @ApiModelProperty(value = "是否上传发票")
+    private Boolean isTicketUrl;
+
     private List<Map<String,String>> billDetailList;
 }

+ 50 - 0
web/src/main/java/com/jpsoft/enterprise/modules/base/controller/BillDetailController.java

@@ -439,6 +439,13 @@ public class BillDetailController {
             }
             dto.setRushStatus(billDetailInfo.getRushStatus());
 
+            if(StringUtils.isNotEmpty(billDetailInfo.getTicketUrl())){
+                dto.setIsTicketUrl(true);
+            }
+            else{
+                dto.setIsTicketUrl(false);
+            }
+
             pageDto.add(dto);
         }
 
@@ -575,6 +582,49 @@ public class BillDetailController {
     }
 
 
+
+    @ApiOperation(value="上传发票")
+    @PostMapping("uploadTicket")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "uploadFile",value = "上传文件", required = true,paramType="form", dataType = "__file")
+    })
+    public MessageResult<BillDetailInfo> uploadTicket(MultipartFile uploadFile,String id,String subFolder,
+                                           @RequestAttribute String subject){
+        MessageResult<BillDetailInfo> msgResult = new MessageResult<>();
+
+        try {
+            String retFileUrl = OSSUtil.upload(ossConfig,"/" + subFolder,uploadFile.getOriginalFilename(),uploadFile.getInputStream());
+
+
+            BillDetailInfo billDetailInfo = billDetailInfoService.get(id);
+            billDetailInfo.setTicketUrl(retFileUrl);
+            billDetailInfo.setUpdateBy(subject);
+            billDetailInfo.setUpdateTime(new Date());
+
+            int affectCount = billDetailInfoService.update(billDetailInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(billDetailInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+
+    }
+
+
+
     @ApiOperation(value="获取主账单信息")
     @GetMapping("getBillInfo/{billId}")
     public MessageResult<Boolean> getBillInfo(@PathVariable("billId") String billId){