Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev

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/java/com/sckw/payment/model/vo/LedgerLogistics.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.payment.model.dto.ILedger;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,6 +25,7 @@ public class LedgerLogistics implements ILedger {
     /**
      * 物流对账单编号
      */
+    @JsonProperty("lLedgerNo")
     private String lLedgerNo;
 
     /**

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

@@ -115,7 +115,14 @@ public class LedgerSell implements ILedger {
     private String statusLabel;
     private String contacts;
     private String phone;
-    private String firmName;
+    /**
+     * 采购
+     */
+    private String purchaseFirmName;
+    /**
+     * 销售
+     */
+    private String sellFirmName;
     /**
      * 创建人
      */

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerTradeService.java

@@ -93,7 +93,6 @@ public class LedgerTradeService extends AbsLedger {
      * @param tradeReq 请求参数
      */
     private void fillPara(TradeReq tradeReq) {
-        tradeReq.setEntId(LoginUserHolder.getEntId());
         if (StringUtils.isNotBlank(tradeReq.getStartCreateTime())) {
             tradeReq.setStartCreateTime(StringTimeUtil.fillStart(tradeReq.getStartCreateTime()));
         }

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

@@ -153,18 +153,39 @@
         order by klt.generate_time desc
     </select>
     <select id="list" resultType="com.sckw.payment.model.vo.LedgerSell">
-        select
-        <include refid="sell_col"/>
+        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.audit_phone   auditPhone,
+               klt.audit_user    auditUser,
+               klt.url,
+               klt.generate_time generateTime,
+               klt.receipt_time  receiptTime,
+               klt.remark,
+               klt.status,
+               klt.create_by     createBy,
+               kltu.contacts,
+               kltu.phone,
+               kltu.firm_name    purchaseFirmName,
+               kltu2.firm_name   sellFirmName,
+               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}
+                 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
-            and kltu2.top_ent_id = #{tradeReq.entId,jdbcType=BIGINT}
             <if test="tradeReq.status != null">
                 and klt.status = #{tradeReq.status}
             </if>
@@ -173,20 +194,23 @@
             </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}
+                    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}
-                , '%')
-                )
+                            klt.t_ledger_no like concat('%'
+                            , #{tradeReq.keywords,jdbcType=VARCHAR}
+                            , '%')
+                        or kltu.firm_name like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                        or kltu2.firm_name like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                        or kltu.contacts like concat('%'
+                        , #{tradeReq.keywords,jdbcType=VARCHAR}
+                        , '%')
+                    )
             </if>
         </where>
         order by klt.generate_time desc

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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/OrderDetailVO.java

@@ -230,4 +230,10 @@ public class OrderDetailVO {
      */
     private String signingWayLabel;
 
+    /**
+     * 待分配量(amount-subcontract_amount-entrust_amount)
+     */
+    private BigDecimal waitDistributionAmount;
+
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementLogisticsOrderService.java

@@ -193,7 +193,7 @@ public class ManagementLogisticsOrderService {
                             }
                         }
                     }
-                } catch (NumberFormatException e) {
+                } catch (Exception e) {
                     System.out.println("查询贸易订单失败!" + tOrderId + ";" + e.getMessage());
                 }
             }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -264,6 +264,9 @@ public class TransportCommonService {
             orderDetailVO.setPriceLabel(sysDictResDto == null ? null : sysDictResDto.getLabel());
         }
         orderDetailVO.setRemark(logisticsOrder.getRemark());
+        orderDetailVO.setWaitDistributionAmount(logisticsOrder.getAmount()
+                .subtract(logisticsOrder.getSubcontractAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getSubcontractAmount())
+                .subtract(logisticsOrder.getEntrustAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getEntrustAmount()));
         /**亏吨量/吨->装货量-卸货量
          * 合理损耗值=装货量*合理损耗
          扣亏量/吨->亏吨量-合理损耗值
@@ -516,8 +519,8 @@ public class TransportCommonService {
         }
         ids = ids.stream().distinct().collect(Collectors.toList());
         logisticsOrderParam.setPage((logisticsOrderParam.getPage() - 1) * logisticsOrderParam.getPageSize());
-        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(),ids);
-        Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(),ids);
+        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(), ids);
+        Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(), ids);
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**运价方式*/

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -144,7 +144,7 @@ public class WaybillManagementService {
             wayBillDetailDTO.setCheckFirmName(info.getCheckFirmName());
             // 运输量单位
             wayBillDetailDTO.setUnit(info.getUnit() == null ? null : info.getUnit());
-            if(info.getUnit() != null) {
+            if (info.getUnit() != null) {
                 Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
                 SysDictResDto sysDict = unitType.get(info.getUnit());
                 wayBillDetailDTO.setUnitLabel(sysDict.getLabel());
@@ -450,9 +450,9 @@ public class WaybillManagementService {
             waybillBoardListVO.setTracks(statusVOS2);
             // 运单量单位
             waybillBoardListVO.setUnit(sckwWaybillOrder.getUnit());
-            if(sckwWaybillOrder.getUnit() != null) {
+            if (sckwWaybillOrder.getUnit() != null) {
                 Map<String, String> unitType = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
-                String sysDict = unitType.get(sckwWaybillOrder.getUnit());
+                String sysDict = unitType == null ? null : unitType.get(sckwWaybillOrder.getUnit());
                 waybillBoardListVO.setUnitLabel(sysDict);
             }
             // 运单进度