cashierdesk / dili-cashier · Commits

Commit 7c3869974cc5988616fc0f25788b7b33ecae66c1

Authored by 吕琪
1 parent ce85802e
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/TaxAgentNotifyServiceImpl.java
  View file @7c38699
... ... @@ -290,7 +290,7 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
290 290 private void sendBuyerReceivableMessage(TaxAgentPrepareInfo taxAgentPrepareInfo, String entity,
291 291 String pipelineCode, Map<String, Object> infoMap) {
292 292 // 费用项
293   - String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
  293 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action + "-" + infoMap.get("orderType");
294 294 String chargeItemDept;
295 295  
296 296 if (taxAgentPrepareInfo.isCardPay) {
... ... @@ -311,9 +311,9 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
311 311  
312 312 private void sendSellerReceivableMessage(String sellerCustomerCode, TaxAgentPrepareInfo taxAgentPrepareInfo, String entity,
313 313 String pipelineCode, Map<String, Object> infoMap) {
314   - String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
  314 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action + "-" + infoMap.get("orderType");
315 315 infoMap.put(ORG, taxAgentPrepareInfo.payType + "-S" + "-" + infoMap.get("orderType"));
316   - String chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType) + infoMap.get("orderType");
  316 + String chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get("orderType") + "-" + infoMap.get("orderType");
317 317 infoMap.put(SALE_DEPT, chargeItemDept);
318 318 String quotedQuantity;
319 319 if (ObjectUtil.equal(taxAgentPrepareInfo.type, TaxMessageType.ORDER_PAY.getCode())) {
... ... @@ -352,7 +352,7 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
352 352 BigDecimal amountYuan = convertToYuan(taxAgentPrepareInfo.amount);
353 353  
354 354 ArrayList<ReceiptItem> items = new ArrayList<>();
355   - String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
  355 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action + "-" + map.get("orderType");
356 356 items.add(ReceiptItem.of(chargeItem, String.valueOf(taxAgentPrepareInfo.payType),
357 357 String.valueOf(amountYuan), taxAgentPrepareInfo.cardNo));
358 358 map.put(RECEIPT_ITEM, items);
... ... @@ -369,7 +369,7 @@ public class TaxAgentNotifyServiceImpl implements TaxAgentNotifyService {
369 369 BigDecimal amountYuan = convertToYuan(taxAgentPrepareInfo.amount);
370 370  
371 371 ArrayList<RefundItem> items = new ArrayList<>();
372   - String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
  372 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action + "-" + map.get("orderType");
373 373 items.add(RefundItem.of(chargeItem, String.valueOf(taxAgentPrepareInfo.payType),
374 374 String.valueOf(amountYuan), "退款", taxAgentPrepareInfo.cardNo));
375 375 map.put(REFUND_ITEM, items);
... ...