cashierdesk / dili-cashier · Commits

Commit ce85802ec997089332071fdbbc9db222d5b2508e

Authored by 吕琪
1 parent 15958293
build: skipped

fix(tax): 修复税务代理通知服务中的组织机构代码构建逻辑

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/TaxAgentNotifyServiceImpl.java
  View file @ce85802
@@ -294,12 +294,12 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService { @@ -294,12 +294,12 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
294 String chargeItemDept; 294 String chargeItemDept;
295 295
296 if (taxAgentPrepareInfo.isCardPay) { 296 if (taxAgentPrepareInfo.isCardPay) {
297 - infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B" + "-" + infoMap.get(AREA));  
298 - chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get(AREA); 297 + infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B" + "-" + infoMap.get(AREA) + "-" + infoMap.get("orderType"));
  298 + chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get(AREA) + infoMap.get("orderType");
299 infoMap.put(SALE_DEPT, chargeItemDept); 299 infoMap.put(SALE_DEPT, chargeItemDept);
300 } else { 300 } else {
301 - infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B");  
302 - chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType); 301 + infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B" + "-" + infoMap.get("orderType"));
  302 + chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType) + infoMap.get("orderType");
303 infoMap.put(SALE_DEPT, chargeItemDept); 303 infoMap.put(SALE_DEPT, chargeItemDept);
304 } 304 }
305 // 客户 305 // 客户
@@ -312,8 +312,8 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService { @@ -312,8 +312,8 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
312 private void sendSellerReceivableMessage(String sellerCustomerCode, TaxAgentPrepareInfo taxAgentPrepareInfo, String entity, 312 private void sendSellerReceivableMessage(String sellerCustomerCode, TaxAgentPrepareInfo taxAgentPrepareInfo, String entity,
313 String pipelineCode, Map<String, Object> infoMap) { 313 String pipelineCode, Map<String, Object> infoMap) {
314 String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action; 314 String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
315 - infoMap.put(ORG, taxAgentPrepareInfo.payType + "-S");  
316 - String chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType); 315 + infoMap.put(ORG, taxAgentPrepareInfo.payType + "-S" + "-" + infoMap.get("orderType"));
  316 + String chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType) + infoMap.get("orderType");
317 infoMap.put(SALE_DEPT, chargeItemDept); 317 infoMap.put(SALE_DEPT, chargeItemDept);
318 String quotedQuantity; 318 String quotedQuantity;
319 if (ObjectUtil.equal(taxAgentPrepareInfo.type, TaxMessageType.ORDER_PAY.getCode())) { 319 if (ObjectUtil.equal(taxAgentPrepareInfo.type, TaxMessageType.ORDER_PAY.getCode())) {