代码完善

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -13,14 +13,15 @@ import jakarta.validation.Valid;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
-* 对账-交易订单
-*
-* @author xucaiqin
-*/
+ * 对账-交易订单
+ *
+ * @author xucaiqin
+ */
 @RestController
 @RequestMapping("/kwpLedgerTrade")
 public class KwpLedgerTradeController {
@@ -148,7 +149,6 @@ public class KwpLedgerTradeController {
             BeanUtils.copyProperties(a, ledgerLogisticsVo);
             return ledgerLogisticsVo;
         }).collect(Collectors.toList());
-
         ExcelUtil.download(response, LedgerLogisticsVo.class, collect);
         return null;
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/dao/KwpLedgerTradeMapper.java

@@ -7,7 +7,6 @@ import com.sckw.payment.model.vo.req.TradeReq;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -17,5 +16,5 @@ import java.util.List;
 
 @Mapper
 public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
-    List<LedgerTradeDto> pageSelect(@Param("tradeReq") TradeReq tradeReq, ArrayList<Object> objects);
+    List<LedgerTradeDto> pageSelect(@Param("tradeReq") TradeReq tradeReq);
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsSendReq.java

@@ -60,7 +60,7 @@ public class LogisticsSendReq {
     /**
      * 发票税率（%）
      */
-    @NotBlank(message = "发票税率（%）不能为空")
+    @NotNull(message = "发票税率（%）不能为空")
     private Integer taxRate;
     /**
      * 交易方式

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeSendReq.java

@@ -54,7 +54,7 @@ public class TradeSendReq {
     /**
      * 发票税率（%）
      */
-    @NotBlank(message = "发票税率（%）不能为空")
+    @NotNull(message = "发票税率（%）不能为空")
     private Integer taxRate;
     /**
      * 交易方式
@@ -78,4 +78,6 @@ public class TradeSendReq {
      */
     @NotEmpty(message = "销售订单不能为空")
     private List<Long> ids;
+
+    private LocalDateTime generateTime;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/LedgerLogisticsVo.java

@@ -1,9 +1,11 @@
 package com.sckw.payment.model.vo.res;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sckw.excel.annotation.ExcelContext;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -57,13 +59,17 @@ public class LedgerLogisticsVo {
     /**
      * 开始日期
      */
-    //@ExcelProperty(value = "开始日期")
+    @ExcelProperty(value = "开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
      * 结束日期
      */
-    //@ExcelProperty(value = "结束日期")
+    @ExcelProperty(value = "结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.core.exception.BusinessException;
@@ -16,7 +17,7 @@ import com.sckw.payment.model.constant.TradeUnitType;
 import com.sckw.payment.model.dto.LedgerTradeDto;
 import com.sckw.payment.model.vo.req.*;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,6 +34,7 @@ import java.util.Objects;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class KwpLedgerTradeService extends AbsLedger {
     private final KwpLedgerTradeMapper tradeMapper;
     private final KwpLedgerTradeTrackService tradeTrackService;
@@ -47,15 +49,9 @@ public class KwpLedgerTradeService extends AbsLedger {
      * @return
      */
     public PageRes<LedgerTradeDto> pageList(TradeReq tradeReq) {
-        String keywords = tradeReq.getKeywords();
-        if (StringUtils.isNotBlank(keywords)) {
-
-        }
         PageHelper.startPage(tradeReq.getPage(), tradeReq.getPageSize());
-        List<LedgerTradeDto> ledgerTradeDto = tradeMapper.pageSelect(tradeReq, new ArrayList<>());
-
+        List<LedgerTradeDto> ledgerTradeDto = tradeMapper.pageSelect(tradeReq);
         return new PageRes<>(new PageInfo<>(ledgerTradeDto));
-
     }
 
     private void removeDraft(Long id) {
@@ -67,35 +63,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         tradeUnitService.remove(id);
     }
 
-    /**
-     * 保存对账单
-     *
-     * @param tradeSendReq
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public String sendLedger(TradeSendReq tradeSendReq) {
-        Long id = tradeSendReq.getId();
-        if (Objects.isNull(id)) {
-            //新增
-            sendLedgerDraft(tradeSendReq);
-        } else {
-            //先删除
-            removeDraft(id);
-            //在新增
-            sendLedgerDraft(tradeSendReq);
-        }
-        return null;
-    }
-
-    /**
-     * 保存草稿
-     *
-     * @param tradeSendReq
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public String sendLedgerDraft(TradeSendReq tradeSendReq) {
+    private Long saveDraft(TradeSendReq tradeSendReq) {
         KwpLedgerTrade kwpLedgerTrade = new KwpLedgerTrade();
         kwpLedgerTrade.setId(Objects.isNull(tradeSendReq.getId()) ? new IdWorker(1).nextId() : tradeSendReq.getId());
         kwpLedgerTrade.setEntId(0L);//todo
@@ -110,6 +78,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpLedgerTrade.setActualPrice(new BigDecimal("0.0"));
         kwpLedgerTrade.setAuditUser("");
         kwpLedgerTrade.setAuditPhone("");
+        kwpLedgerTrade.setGenerateTime(tradeSendReq.getGenerateTime());
         kwpLedgerTrade.setUrl("");
         kwpLedgerTrade.setRemark("");
         kwpLedgerTrade.setStatus(LedgerEnum.SAVE.getStatus());
@@ -151,9 +120,48 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         list.add(kwpLedgerTradeUnit);
         tradeUnitService.saveList(list);
-        /*保存操作记录*/
-        tradeTrackService.saveTrack(kwpLedgerTrade.getId(), "", LedgerTrackEnum.SAVE);
-        return null;
+        return kwpLedgerTrade.getId();
+    }
+
+    /**
+     * 保存对账单
+     *
+     * @param tradeSendReq
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String sendLedger(TradeSendReq tradeSendReq) {
+        Long id = tradeSendReq.getId();
+        if (Objects.isNull(id)) {
+            //新增
+            tradeSendReq.setGenerateTime(LocalDateTime.now());
+            Long aLong = saveDraft(tradeSendReq);
+            tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+        } else {
+            //先删除
+            removeDraft(id);
+            //在新增
+            tradeSendReq.setGenerateTime(LocalDateTime.now());
+            Long aLong = saveDraft(tradeSendReq);
+            tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.TO_LEDGER);
+
+        }
+        return "保存对账单成功";
+    }
+
+    /**
+     * 保存草稿
+     *
+     * @param tradeSendReq
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public String sendLedgerDraft(TradeSendReq tradeSendReq) {
+        log.info("贸易对账单保存草稿：{}", JSONObject.toJSONString(tradeSendReq));
+        tradeSendReq.setGenerateTime(null);
+        Long aLong = saveDraft(tradeSendReq);
+        tradeTrackService.saveTrack(aLong, "", LedgerTrackEnum.SAVE);
+        return "草稿保存成功";
     }
 
 

sckw-modules/sckw-payment/src/main/resources/mapper/KwpLedgerTradeMapper.xml

@@ -75,6 +75,9 @@
                   )
           </if>
       </where>
-      group by
+      group by klt.id, klt.t_ledger_no, klt.name, klt.start_time, klt.end_time, klt.tax_rate, klt.trading,
+               klt.total_price, klt.settle_price, klt.actual_price, klt.url, klt.generate_time, klt.remark, klt.status,
+               kltu.contacts, kltu.phone, kltu.firm_name
+      order by klt.generate_time desc
   </select>
 </mapper>