贸易对账导出接口

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

@@ -1,13 +1,11 @@
 package com.sckw.payment.controller;
 
-import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.constant.LedgerEnum;
 import com.sckw.payment.model.constant.TradeUnitType;
-import com.sckw.payment.model.dto.LedgerPurchaseDto;
-import com.sckw.payment.model.dto.LedgerSellDto;
+import com.sckw.payment.model.dto.LedgerTradeDto;
 import com.sckw.payment.model.vo.req.*;
 import com.sckw.payment.model.vo.res.LedgerTradeVo;
 import com.sckw.payment.service.KwpLedgerTradeService;
@@ -142,7 +140,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("sellCount")
-    public HttpResult sellCount(@RequestBody  TradeReq tradeReq) {
+    public HttpResult sellCount(@RequestBody TradeReq tradeReq) {
         tradeReq.setUnitType(TradeUnitType.PURCHASE);
         tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
         return HttpResult.ok(kwpLedgerTradeService.orderCount(tradeReq));
@@ -154,7 +152,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("purchaseCount")
-    public HttpResult purchaseCount(@RequestBody  TradeReq tradeReq) {
+    public HttpResult purchaseCount(@RequestBody TradeReq tradeReq) {
         tradeReq.setUnitType(TradeUnitType.SELL);
         tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
         List<TableTop> tableTops = kwpLedgerTradeService.orderCount(tradeReq);
@@ -242,18 +240,10 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("sellExport")
-    public HttpResult sellExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
-        List<LedgerSellDto> list;
-
-        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
-            tradeReq.setPage(0);
-            tradeReq.setPageSize(0);
-            PageRes<LedgerSellDto> pageResult = kwpLedgerTradeService.sellList(tradeReq);
-            list = pageResult.getList();
-        } else {
-            list = kwpLedgerTradeService.selectSellList(tradeReq.getIdList());
-        }
-
+    public HttpResult sellExport(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
+        tradeReq.setUnitType(TradeUnitType.PURCHASE);
+        tradeReq.setUnitTypeTwo(TradeUnitType.SELL);
+        List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
         }
@@ -274,17 +264,10 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("purchaseExport")
-    public HttpResult purchaseExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
-        List<LedgerPurchaseDto> list;
-        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
-            tradeReq.setPage(0);
-            tradeReq.setPageSize(0);
-            PageRes<LedgerPurchaseDto> pageResult = kwpLedgerTradeService.purchaseList(tradeReq);
-            list = pageResult.getList();
-        } else {
-            list = kwpLedgerTradeService.selectPurchaseList(tradeReq.getIdList());
-        }
-
+    public HttpResult purchaseExport(HttpServletResponse response, @RequestBody TradeReq tradeReq) {
+        tradeReq.setUnitType(TradeUnitType.SELL);
+        tradeReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
+        List<LedgerTradeDto> list = kwpLedgerTradeService.exportList(tradeReq, tradeReq.getIdList());
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
         }

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

@@ -99,4 +99,6 @@ public interface KwpLedgerTradeMapper extends BaseMapper<KwpLedgerTrade> {
      * @return
      */
     List<LedgerSell> selectIds(@Param("ids") List<Long> ids);
+
+    List<LedgerTradeDto> exportList(@Param("tradeReq") TradeReq tradeReq, @Param("idList") List<Long> idList);
 }

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

@@ -51,22 +51,10 @@ public class LedgerTradeVo {
      * 订单数量
      */
     @ExcelProperty(value = "订单数量")
-    private Long orderCount;
+    private Integer orderCount;
+
 
 
-//    /**
-//     * 开始日期
-//     */
-//    @ExcelProperty(value = "开始日期")
-//    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private LocalDateTime startTime;
-//
-//    /**
-//     * 结束日期
-//     */
-//    @ExcelProperty(value = "结束日期")
-//    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    private LocalDateTime endTime;
     /**
      * 付款方式(预付款、货到付款）
      */
@@ -97,20 +85,15 @@ public class LedgerTradeVo {
     @ExcelProperty(value = "已收款/元")
     private BigDecimal actualPrice;
 
-//    /**
-//     * 对账采购财务联系人电话
-//     */
-//    @ExcelProperty(value = "对账采购财务联系人电话")
-//    private String auditPhone;
     /**
      * 客户联系人
      */
-    @ExcelProperty(value = "客户联系人")
+    @ExcelProperty(value = "财务联系人")
     private String contacts;
     /**
      * 联系方式
      */
-    @ExcelProperty(value = "联系方式")
+    @ExcelProperty(value = "财务联系方式")
     private String phone;
 
     /**
@@ -120,12 +103,10 @@ public class LedgerTradeVo {
     @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDateTime receiptTime;
     /**
-     * 对账采购财务联系人名称
+     * 提交人
      */
     @ExcelProperty(value = "提交人")
-    private String auditUser;
-
-
+    private String createByName;
 
     /**
      * 生成时间

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

@@ -263,9 +263,9 @@ public class KwpLedgerTradeService extends AbsLedger {
             //1x 预付款 2x 货到付款 3x 线下付款
             Integer prefix = TradingEnum.getPrefix(trading);
             //仅预付款需要校验冻结单号
-            if (Objects.nonNull(prefix) && prefix == TradingEnum.PRE_PAY.getStatus() ) {
+            if (Objects.nonNull(prefix) && prefix == TradingEnum.PRE_PAY.getStatus()) {
                 KwpTradeFreeze byTOrderId = kwpTradeFreezeService.getByTOrderId(id);
-                if(Objects.isNull(byTOrderId)){
+                if (Objects.isNull(byTOrderId)) {
                     throw new BusinessException("未找到关联的冻结单");
                 }
                 map.put(id, byTOrderId.getOrderNo());
@@ -909,4 +909,11 @@ public class KwpLedgerTradeService extends AbsLedger {
     public LedgerSize count(Long entId) {
         return tradeMapper.countSize(entId);
     }
+
+    public List<LedgerTradeDto> exportList(TradeReq tradeReq, List<Long> idList) {
+        fillPara(tradeReq);
+        List<LedgerTradeDto> ledgerTradeDtos = tradeMapper.exportList(tradeReq, idList);
+        changeDict(ledgerTradeDtos);
+        return ledgerTradeDtos;
+    }
 }

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

@@ -1295,7 +1295,6 @@ public class WalletService {
      * @return
      */
     public PageRes<ChargeDetailVo> rechargeList(MoneyPage moneyPage) {
-        fillPara(moneyPage);
         R<RechargePage> rechargePageR = payCenterService.rechargeOrder(moneyPage.getUid(), moneyPage.getStartCreateTime(), moneyPage.getEndCreateTime(), moneyPage.getKeywords(), moneyPage.getPage(), moneyPage.getPageSize());
         if (!rechargePageR.getStatus()) {
             throw new BusinessException(StringUtils.isBlank(rechargePageR.getMsg()) ? "查询失败" : rechargePageR.getMsg());
@@ -1334,7 +1333,6 @@ public class WalletService {
      * @return
      */
     public PageRes<WalletDetailBase> transferOrder(MoneyPage moneyPage) {
-        fillPara(moneyPage);
         PageHelper.startPage(moneyPage.getPage(), moneyPage.getPageSize());
         List<KwpWalletTransfer> kwpWalletTransfers = kwpWalletTransferMapper.pageList(moneyPage);
         PageInfo<KwpWalletTransfer> pageInfo = new PageInfo<>(kwpWalletTransfers);
@@ -1368,12 +1366,6 @@ public class WalletService {
      * @return
      */
     public PageRes<WalletDetailBase> refundOrder(MoneyPage moneyPage) {
-        if (StringUtils.isNotBlank(moneyPage.getStartCreateTime())) {
-            moneyPage.setStartCreateTime(StringTimeUtil.fillStart(moneyPage.getStartCreateTime()));
-        }
-        if (StringUtils.isNotBlank(moneyPage.getEndCreateTime())) {
-            moneyPage.setEndCreateTime(StringTimeUtil.fillEnd(moneyPage.getEndCreateTime()));
-        }
         RefundPage refundPage = new RefundPage();
         BeanUtils.copyProperties(moneyPage, refundPage);
         PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);
@@ -1446,12 +1438,6 @@ public class WalletService {
      * @return
      */
     public PageRes<WalletDetailBase> prePayRefund(MoneyPage moneyPage) {
-        if (StringUtils.isNotBlank(moneyPage.getStartCreateTime())) {
-            moneyPage.setStartCreateTime(StringTimeUtil.fillStart(moneyPage.getStartCreateTime()));
-        }
-        if (StringUtils.isNotBlank(moneyPage.getEndCreateTime())) {
-            moneyPage.setEndCreateTime(StringTimeUtil.fillEnd(moneyPage.getEndCreateTime()));
-        }
         RefundPage refundPage = new RefundPage();
         BeanUtils.copyProperties(moneyPage, refundPage);
         PageRes<WalletRefundVo> walletRefundVoPageRes = walletOrderService.queryRefundList(refundPage);

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

@@ -517,8 +517,6 @@
                kll.ex_tax_price                 exTaxPrice,
                kll.settle_price                 settlePrice,
                kll.actual_price                 actualPrice,
-               kll.success_phone                successPhone,
-               kll.success_user                 successUser,
                kll.url,
                kll.generate_time                generateTime,
                kll.receipt_time                 receiptTime,

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

@@ -608,4 +608,76 @@
               and kltu.top_ent_id = #{entId,jdbcType=BIGINT}
         </where>
     </select>
+
+    <select id="exportList" resultType="com.sckw.payment.model.dto.LedgerTradeDto">
+        select klt.id,
+               klt.t_ledger_no                     tLedgerNo,
+               klt.name,
+               klt.start_time                      startTime,
+               klt.end_time                        endTime,
+               klt.tax_rate                        taxRate,
+               klt.trading,
+               klt.total_price                     totalPrice,
+               klt.ex_tax_price                    exTaxPrice,
+               klt.settle_price                    settlePrice,
+               klt.actual_price                    actualPrice,
+               klt.url,
+               klt.generate_time                   generateTime,
+               klt.receipt_time                    receiptTime,
+               klt.remark,
+               klt.status,
+               klt.create_by                       createBy,
+               (case
+                    when #{tradeReq.unitType,jdbcType=INTEGER} = 1 then klt.audit_user
+                    else klt.success_user end)  as contacts,
+               (case
+                    when #{tradeReq.unitType,jdbcType=INTEGER} = 1 then klt.audit_phone
+                    else klt.success_phone end) as phone,
+               kltu.firm_name                      firmName,
+               klt.order_count                     orderCount
+        from kwp_ledger_trade klt
+                 inner join kwp_ledger_trade_unit kltu
+                            on klt.id = kltu.t_ledger_id and kltu.del_flag = 0 and
+                               kltu.unit_type = #{tradeReq.unitType,jdbcType=INTEGER}
+                 inner join kwp_ledger_trade_unit kltu2
+                            on klt.id = kltu2.t_ledger_id and kltu2.del_flag = 0 and kltu2.unit_type =
+                                                                                     #{tradeReq.unitTypeTwo,jdbcType=INTEGER}
+        <where>
+            klt.del_flag = 0
+            <choose>
+                <when test="idList != null and idList.size() != 0">
+                    and klt.id in
+                    <foreach collection="idList" open="(" separator="," close=")" item="item">
+                        #{item,jdbcType=BIGINT}
+                    </foreach>
+                </when>
+                <otherwise>
+                    and kltu2.top_ent_id = #{tradeReq.entId,jdbcType=BIGINT}
+                    <if test="tradeReq.status != null">
+                        and klt.status = #{tradeReq.status}
+                    </if>
+                    <if test="tradeReq.trading != null">
+                        and klt.trading = #{tradeReq.trading,jdbcType=INTEGER}
+                    </if>
+                    <if test="tradeReq.endCreateTime != null and tradeReq.endCreateTime != '' and tradeReq.startCreateTime != null and tradeReq.startCreateTime != ''">
+                        and klt.generate_time between #{tradeReq.startCreateTime,jdbcType=TIMESTAMP}
+                        and #{tradeReq.endCreateTime,jdbcType=TIMESTAMP}
+                    </if>
+                    <if test="tradeReq.keywords != null and tradeReq.keywords != ''">
+                        and (
+                        klt.t_ledger_no like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                        or kltu.firm_name like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                        or kltu.contacts like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                        )
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+    </select>
 </mapper>