样式微调

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/operate/SettlementWalletController.java

@@ -29,8 +29,8 @@ public class SettlementWalletController {
      * @param settlementWalletReq
      * @return
      */
-    @PostMapping(name = "物流-电子钱包付款（货到付款）结算记录-列表", path = "logisticsList")
-    public HttpResult logisticsList(@RequestBody @Valid SettlementWalletReq settlementWalletReq) {
+    @GetMapping("logisticsList")
+    public HttpResult logisticsList(@Valid SettlementWalletReq settlementWalletReq) {
         settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
         settlementWalletReq.setOrderType(SettlementOrderTypeEnum.LOGISTICS.getStatus());
         return HttpResult.ok(settlementWalletService.pageList(settlementWalletReq));
@@ -42,7 +42,7 @@ public class SettlementWalletController {
      * @param settlementWalletReq
      * @return
      */
-    @GetMapping(name = "销售-付款记录列表（采购电子钱包结算记录）", path = "tradeList")
+    @GetMapping("tradeList")
     public HttpResult tradeList(@Valid SettlementWalletReq settlementWalletReq) {
         settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.CASH_ON_DELIVERY.getStatus());
         settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());
@@ -56,7 +56,7 @@ public class SettlementWalletController {
      * @param settlementWalletReq
      * @return
      */
-    @GetMapping(name = "销售-收款记录列表-预付款(电子钱包)", path = "tradePreList")
+    @GetMapping( "tradePreList")
     public HttpResult tradePreList(@Valid SettlementWalletReq settlementWalletReq) {
         settlementWalletReq.setPayType(SettlementWalletPayTypeEnum.ADVANCE_PAYMENT.getStatus());
         settlementWalletReq.setOrderType(SettlementOrderTypeEnum.TRADE.getStatus());

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

@@ -152,30 +152,31 @@
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.SettlementLogistics">
         select s.id,
-               s.ent_id        as entId,
-               s.l_ledger_id   as lLedgerId,
-               s.sl_order_no   as slOrderNo,
-               s.total_price   as totalPrice,
-               s.actual_price  as actualPrice,
-               s.receipt_time  as receiptTime,
+               s.ent_id                       as entId,
+               s.l_ledger_id                  as lLedgerId,
+               s.sl_order_no                  as slOrderNo,
+               s.total_price                  as totalPrice,
+               s.actual_price                 as actualPrice,
+               s.total_price - s.actual_price as waitPrice,
+               s.receipt_time                 as receiptTime,
                s.remark,
-               s.audit_user    as auditUser,
-               s.audit_phone   as auditPhone,
-               s.success_user  as successUser,
-               s.success_phone as successPhone,
+               s.audit_user                   as auditUser,
+               s.audit_phone                  as auditPhone,
+               s.success_user                 as successUser,
+               s.success_phone                as successPhone,
                s.status,
-               s.create_by     as createBy,
-               s.create_time   as createTime,
-               s.update_by     as updateBy,
-               s.update_time   as updateTime,
+               s.create_by                    as createBy,
+               s.create_time                  as createTime,
+               s.update_by                    as updateBy,
+               s.update_time                  as updateTime,
                l.name,
-               l.generate_time as generateTime,
-               l.l_ledger_no   as lLedgerNo,
-               l.trading       as trading,
-               l.settle_price  as settlePrice,
-               l.url           as url,
-               lu.firm_name    as shipperFirmName,
-               lu2.firm_name   as carrierFirmName
+               l.generate_time                as generateTime,
+               l.l_ledger_no                  as lLedgerNo,
+               l.trading                      as trading,
+               l.settle_price                 as settlePrice,
+               l.url                          as url,
+               lu.firm_name                   as shipperFirmName,
+               lu2.firm_name                  as carrierFirmName
         from kwp_settlement_logistics s
                  inner join kwp_ledger_logistics l on s.l_ledger_id = l.id and l.del_flag = 0
                  inner join kwp_ledger_logistics_unit lu on s.l_ledger_id = lu.l_ledger_id and lu.del_flag = 0 and