结算币种修改;

2025-12-23 13:38:56 +08:00
parent b55a782473
commit 1d9629127a
13 changed files with 74 additions and 9 deletions
@@ -194,4 +194,7 @@ public class UserShipperEntity extends BaseVOEntity {

    @ApiModelProperty(name = "客户nc编码")
    private String customerNcCode;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }
@@ -228,4 +228,7 @@ public class UserShipperDO extends UserDO {

    @ApiModelProperty(name = "客户nc编码")
    private String customerNcCode;
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }
@@ -194,4 +194,7 @@ public class UserShipperDTO extends UserDTO {
    @ApiModelProperty("客户nc编码")
    private String customerNcCode;

+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }
@@ -96,7 +96,7 @@
        FROM
            user_shipper s
                LEFT JOIN
-            "user" u
+            "USER" u
            ON u.user_id = s.user_id
        <where>
            <if test="topOrganizationId != null "> and u.top_organization_id = #{topOrganizationId}</if>
@@ -117,7 +117,7 @@
        FROM
        user_shipper s
        LEFT JOIN
-        "user" u
+        "USER" u
        ON u.user_id = s.user_id and u.del_flag = 1
        <where>
            s.del_flag = 1 and  s.shipper_fill = 3
@@ -411,7 +411,7 @@
        a.user_account,
        a.avatar
        FROM
-        "user" a
+        "USER" a
        WHERE
        a.del_flag = 1
        <include refid="common_where1"></include>
@@ -658,7 +658,7 @@
            us.shipper_enterprise_name,
            us.shipper_type
        FROM
-            "user" u
+            "USER" u
                LEFT JOIN user_shipper us ON u.user_id = us.user_id
        WHERE
            u.del_flag = 1
@@ -676,7 +676,7 @@
            ude.driver_enterprise_name,
            ude.driver_type
        FROM
-            "user" u
+            "USER" u
                LEFT JOIN user_driver_enterprise ude ON u.user_id = ude.user_id
        WHERE
            u.del_flag = 1
@@ -700,7 +700,7 @@
        a.user_account,
        a.avatar
        FROM
-        "user" a
+        "USER" a
        WHERE
          a.del_flag = 1
          and a.top_organization_id = #{topOrganizationId}
@@ -191,7 +191,7 @@
        b.shipper_enterprise_fill,
        a.business_type
        FROM
-        "user" a
+        "USER" a
        LEFT JOIN user_shipper b ON b.user_id = a.user_id
        LEFT JOIN user_role ur ON b.user_id = ur.user_id
        LEFT JOIN role r ON ur.role_id = r.role_id
@@ -1,5 +1,6 @@
 package com.linke.finance.application.server.reconciliation;

+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
 import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
@@ -14,10 +15,13 @@ import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO;
 import com.linke.finance.domain.reconciliation.service.ReconciliationDomainService;
 import com.linke.finance.domain.revenueExpensesRecord.entity.RevenueExpensesRecord;
 import com.linke.finance.domain.revenueExpensesRecord.service.RevenueExpensesRecordDomainService;
+import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt;
+import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper;
 import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO;
 import com.linke.finance.domain.tmsReceipt.service.TmsReceiptDomainService;
 import com.linke.finance.domain.verification.service.VerificationDomainService;
 import com.linke.finance.infrastructure.feign.ProductServiceFeign;
+import com.linke.finance.infrastructure.feign.WlhyServiceFeign;
 import com.mhd.common.core.constant.SubjectConstants;
 import com.mhd.common.core.domain.dto.ReconciliationDTO;
 import com.mhd.common.core.domain.entity.Verification;
@@ -37,11 +41,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;

+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;

 /**
@@ -65,6 +71,10 @@ public class ReconciliationApplicationService {
    private TmsReceiptDomainService tmsReceiptDomainService;
    @Autowired
    private RevenueExpensesRecordDomainService revenueExpensesRecordDomainService;
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
+    @Resource
+    private TmsReceiptMapper tmsReceiptMapper;



@@ -86,7 +96,21 @@ public class ReconciliationApplicationService {
                reconciliationDO.setOrganizationId(userPo.getOrganizationId());
            }
        }
-        return reconciliationDomainService.queryList(reconciliationDO);
+        List<ReconciliationPO> reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO);
+        for (ReconciliationPO reconciliationPO : reconciliationPOS) {
+            Long reconciliationId = reconciliationPO.getReconciliationId();
+            AjaxResult tmsOrderSettlementDetails = wlhyServiceFeign.getById(reconciliationId);
+            Map<String,Object> result = (Map<String,Object>)tmsOrderSettlementDetails.get("result");
+            if (ObjectUtil.isNotEmpty( result)){
+                Integer receiptIdstr = (Integer)result.get("receiptId");
+                Long receiptId =  receiptIdstr.longValue();
+                TmsReceipt tmsReceipt = tmsReceiptMapper.selectById(receiptId);
+                if (tmsReceipt != null) {
+                    reconciliationPO.setSettlementCurrency(tmsReceipt.getSettlementCurrency());
+                }
+            }
+        }
+        return reconciliationPOS;
    }

    /**
@@ -238,4 +238,8 @@ public class ReconciliationPO extends BaseVOEntity{
    @ApiModelProperty(value = "nc唯一标识")
    private String skNcId;

+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }
@@ -115,4 +115,7 @@ public class TmsReceipt extends BaseVOEntity{
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private java.util.Date synchronousTime;

+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }
@@ -107,4 +107,6 @@ public class TmsReceiptPO extends BaseVOEntity{
    @ApiModelProperty("组织名称")
    @Excel(name = "组织名称")
    private String organizationName;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }
@@ -132,4 +132,6 @@ public class TmsReceiptDO extends BaseVOEntity{
    @ApiModelProperty("收款单号")
    @Excel(name = "收款单号")
    private String receivePaymentNumber;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }
@@ -0,0 +1,19 @@
+package com.linke.finance.infrastructure.feign;
+
+import com.mhd.common.core.domain.dto.UserDriverDTO;
+import com.mhd.common.core.web.domain.AjaxResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient("mhd-wlhy-service")
+public interface WlhyServiceFeign {
+
+    /**
+     * @Description 绑定车辆
+     * @Author Alex
+     * @Date 2023/1/5 21:24
+     */
+    @GetMapping("/ntocc/tmsOrder/getById")
+    public AjaxResult getById(@RequestParam(name="id",required=true) Long id);
+}
@@ -127,4 +127,6 @@ public class TmsReceiptDTO extends BaseVOEntity{
    @ApiModelProperty("挂账原因")
    @Excel(name = "挂账原因")
    private String creditReason;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <sql id="selectTmsReceiptPo">
        select id, top_organization_id,organization_id,organization_name,department_name,settlement_party_name,receive_payment_number, receive_payment_amount,
        assignable_amount,assignment_status,credit_amount,credit_reason, receive_payment_time, serial_number,receive_voucher_url,
-        remark, account_name, account_information, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag from tms_receipt
+        remark, account_name, account_information, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag,SETTLEMENT_CURRENCY from tms_receipt
    </sql>

    <sql id="selectTmsReceiptPo1">