Merge branch 'dev' into master

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml

mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java

@@ -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;
     }
 
     /**

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java

@@ -238,4 +238,8 @@ public class ReconciliationPO extends BaseVOEntity{
     @ApiModelProperty(value = "nc唯一标识")
     private String skNcId;
 
+
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java

@@ -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;
+
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java

@@ -107,4 +107,6 @@ public class TmsReceiptPO extends BaseVOEntity{
     @ApiModelProperty("组织名称")
     @Excel(name = "组织名称")
     private String organizationName;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }

mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java

@@ -132,4 +132,6 @@ public class TmsReceiptDO extends BaseVOEntity{
     @ApiModelProperty("收款单号")
     @Excel(name = "收款单号")
     private String receivePaymentNumber;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }

mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java

@@ -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);
+}

mhd_finance/src/main/java/com/linke/finance/interfaces/dto/TmsReceiptDTO.java

@@ -127,4 +127,6 @@ public class TmsReceiptDTO extends BaseVOEntity{
     @ApiModelProperty("挂账原因")
     @Excel(name = "挂账原因")
     private String creditReason;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
 }

mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java

@@ -272,7 +272,12 @@ public class ReconciliationApi extends BaseController{
     @GetMapping(value = "/synchronousNc")
     public AjaxResult synchronousNc(@RequestParam(name="reconciliationId") String reconciliationId)
     {
-        return AjaxResult.success(reconciliationApplicationService.synchronousNc(reconciliationId));
+        try{
+            return AjaxResult.success(reconciliationApplicationService.synchronousNc(reconciliationId));}
+        catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
     }
 
     /**
@@ -283,7 +288,13 @@ public class ReconciliationApi extends BaseController{
     @GetMapping(value = "/synchronousNcSK")
     public AjaxResult synchronousNcSK(@RequestParam(name="reconciliationId") String reconciliationId)
     {
-        return AjaxResult.success(reconciliationApplicationService.synchronousNcSK(reconciliationId));
+        try{
+            return AjaxResult.success(reconciliationApplicationService.synchronousNcSK(reconciliationId));
+        } catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+
     }
 
 }