Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncomeInvoiceSettlement.java

@@ -1,6 +1,6 @@
 package com.jzg.commons.entity.finance.po;
 
-import cn.hutool.core.date.DateTime;
+//import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.util.idgen.IdGenerate;
@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -22,7 +23,7 @@ public class InsPlyIncomeInvoiceSettlement extends BaseModel {
     private String actualReceivedAmount;
 
     @Schema(description = "收款日期")
-    private DateTime receivePaymentDate;
+    private Date receivePaymentDate;
 
     @TableField(exist = false)
     @Schema(description = "凭证")
@@ -32,7 +33,7 @@ public class InsPlyIncomeInvoiceSettlement extends BaseModel {
 
     }
 
-    public InsPlyIncomeInvoiceSettlement(String invoiceId, String actualReceivedAmount,DateTime receivePaymentDate){
+    public InsPlyIncomeInvoiceSettlement(String invoiceId, String actualReceivedAmount,Date receivePaymentDate){
         this.id = IdGenerate.nextId();
         this.invoiceId = invoiceId;
         this.actualReceivedAmount = actualReceivedAmount;

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.core.page.HttpResult;
@@ -12,6 +13,8 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.organization.service.ReceivableService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,17 +25,19 @@ import java.util.List;
 import java.util.Objects;
 
 /**
+ * 财务应收Controller
+ *
  * @author jzg
  * @version 1.0
- * @create 2024-04-28 15:07
- * @description: 财务应收Controller
+ * @date 2024-04-28 15:07
  */
-
 @Tag(name = "财务应收")
 @RequestMapping("/receivable")
 @RestController
 public class ReceivableController {
 
+    private static final Logger log = LoggerFactory.getLogger(ReceivableController.class);
+
     @Autowired
     private ReceivableService receivableService;
 
@@ -161,8 +166,14 @@ public class ReceivableController {
 
     @PostMapping("settlement")
     @Operation(summary = "结算")
-    public HttpResult settlement(@RequestBody SettlementVo settlementVo){
-        return receivableService.settlement(settlementVo) ? HttpResult.ok("结算成功") : HttpResult.error("结算失败");
+    public HttpResult<String> settlement(@RequestBody SettlementVo settlementVo){
+        try{
+            boolean settlement = receivableService.settlement(settlementVo);
+            return settlement ? HttpResult.ok("结算成功") : HttpResult.error("结算失败");
+        }catch (Exception e){
+            log.error("结算失败",e);
+            return HttpResult.error(e.getMessage());
+        }
     }
 
     @PostMapping("settlementList")
@@ -197,7 +208,9 @@ public class ReceivableController {
     @PostMapping("/getPlatFormReceivableList")
     @Operation(summary = "获取平台协议列表")
     public HttpResult getPlatFormReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
-        receivableQueryVo.setQueryType("1");
+        if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
+            receivableQueryVo.setQueryType("1");
+        }
         return HttpResult.ok(receivableService.getPlatFormReceivableList(receivableQueryVo));
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3,6 +3,7 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -35,6 +36,8 @@ import com.jzg.organization.service.ReceivableService;
 import org.redisson.api.RBucket;
 import org.redisson.api.RKeys;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -63,10 +66,13 @@ import java.util.stream.Collectors;
 /**
  * @author tz
  * @description 财务应收模块Service实现
- * @createDate 2024-06-26 10:49:31
+ * @date 2024-06-26 10:49:31
  */
 @Service
 public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyIncome> implements ReceivableService {
+
+    private static final Logger log = LoggerFactory.getLogger(ReceivableServiceImpl.class);
+
     @Autowired
     private RedissonClient redissonClient;
 
@@ -319,6 +325,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean settlement(SettlementVo settlementVo) {
+        log.info("结算：settlementVo=[{}]", JSONUtil.toJsonStr(settlementVo));
         try {
             // 获取应收的金额
             InsPlyIncomeInvoice insPlyIncomeInvoice = insPlyIncomeInvoiceMapper.selectById(settlementVo.getInvoicingId());
@@ -370,8 +377,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
             return true;
         } catch (Exception e) {
+            log.error("结算异常. settlementVo=[{}]",JSONUtil.toJsonStr(settlementVo), e);
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return false;
+            throw new RuntimeException(e.getMessage());
+            // return false;
         }
     }