Merge branch 'dev_wkx_yutong_20260106' into dev

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -14,6 +14,7 @@ import com.mhd.common.core.domain.entity.RevenueExpensesRecord;
 import com.mhd.common.core.domain.entity.SysConfigSwitch;
 import com.mhd.common.core.domain.entity.TmsOrder;
 import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.utils.sms.Result;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.domain.*;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
@@ -509,4 +510,6 @@ public interface WlhyServiceFeign {
     @PostMapping(value = "/feign/outBoundSummary/getOrderListByReconciliation")
     public R<List<TmsOrder>> getOrderListByReconciliation(@RequestBody ReconciliationDTO reconciliationDTO);
 
+    @GetMapping(value = "/ntocc/tmsSettlementExchangeRate/queryById")
+    public Result<?> queryById(@RequestParam(name="id",required=true) String id);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java

@@ -12,6 +12,7 @@ import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.domain.entity.SysConfigSwitch;
 import com.mhd.common.core.domain.entity.TmsOrder;
 import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.utils.sms.Result;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.domain.*;
@@ -509,6 +510,11 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
                 res.setCode(R.FAIL);
                 return res;
             }
+
+            @Override
+            public Result<?> queryById(String id) {
+                return null;
+            }
         };
     }
 }

mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java

@@ -16,7 +16,9 @@ import com.mhd.common.core.exception.digitalLogisticsException.UserError;
 import com.mhd.common.core.utils.IgnoreNullUtil;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.core.utils.sms.Result;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.WlhyServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 /**
  * 收款单ApplicationService
  *
@@ -42,6 +46,8 @@ public class TmsReceiptApplicationService {
     private ITmsReceiptService tmsReceiptService;
     @Autowired
     private RevenueExpensesRecordDomainService revenueExpensesRecordDomainService;
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
 
 
     /**
@@ -122,6 +128,16 @@ public class TmsReceiptApplicationService {
             (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)));
         
         List<TmsReceiptPO> result = tmsReceiptDomainService.queryList(tmsReceiptDO);
+        for (TmsReceiptPO tmsReceiptPO : result) {
+            String settlementCurrency = tmsReceiptPO.getSettlementCurrency();
+            if (settlementCurrency != null) {
+                Result<?> res = wlhyServiceFeign.queryById(settlementCurrency);
+                if(ObjectUtil.isNotEmpty(res)&&res.getCode() == 200) {
+                    Map<String, Object> map = (Map<String, Object>) res.getResult();
+                    tmsReceiptPO.setSettlementCurrency(map.get("englishName").toString());
+                }
+            }
+        }
         log.info("收款单查询 - 查询完成，返回数据条数: {}", result != null ? result.size() : 0);
         return result;
     }