cashierdesk / dili-cashier · Commits

Commit 9be95270bab146e645cecce20c8192e24172e986

Authored by 吕琪
1 parent 7c386997
build: skipped

refactor(tax): 修改费用项

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/TaxAgentNotifyServiceImpl.java
  View file @9be9527
... ... @@ -290,16 +290,16 @@ 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 + "-" + infoMap.get("orderType");
  293 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
294 294 String chargeItemDept;
295 295  
296 296 if (taxAgentPrepareInfo.isCardPay) {
297 297 infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B" + "-" + infoMap.get(AREA) + "-" + infoMap.get("orderType"));
298   - chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get(AREA) + infoMap.get("orderType");
  298 + chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get(AREA) + "-" + infoMap.get("orderType");
299 299 infoMap.put(SALE_DEPT, chargeItemDept);
300 300 } else {
301 301 infoMap.put(ORG, taxAgentPrepareInfo.payType + "-B" + "-" + infoMap.get("orderType"));
302   - chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType) + infoMap.get("orderType");
  302 + chargeItemDept = String.valueOf(taxAgentPrepareInfo.payType) + "-" + infoMap.get("orderType");
303 303 infoMap.put(SALE_DEPT, chargeItemDept);
304 304 }
305 305 // 客户
... ... @@ -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 + "-" + infoMap.get("orderType");
  314 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
315 315 infoMap.put(ORG, taxAgentPrepareInfo.payType + "-S" + "-" + infoMap.get("orderType"));
316   - String chargeItemDept = taxAgentPrepareInfo.payType + "-" + infoMap.get("orderType") + "-" + infoMap.get("orderType");
  316 + String chargeItemDept = taxAgentPrepareInfo.payType + "-" + 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 + "-" + map.get("orderType");
  355 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
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 + "-" + map.get("orderType");
  372 + String chargeItem = taxAgentPrepareInfo.payType + "-" + taxAgentPrepareInfo.action;
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);
... ...