From 69d8c54fe4d0c90de196f3d92f74933d06529902 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jan 2021 18:36:37 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index db870b7..520998d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -264,24 +264,9 @@
achieveNew.setT2(orderItem.getIsFree());
// 根据商品类型设置业绩类型
- String goodType = shoppingGoodsDao.selectById(orderItem.getGoodsId()).getGoodType();
- if (orderItem.getPayMethod().equals(Dictionary.PAY_TYPE_MOENY)
- && Dictionary.SHOPPING_GOODS_TYPE_XM.equals(goodType)) {
- // 现金支付设置现金单次
- achieveNew.setProjCash(Double.parseDouble(achieveNew.getT1()));
-
- } else if (orderItem.getPayMethod().equals(Dictionary.PAY_TYPE_MOENY)
- && Dictionary.SHOPPING_GOODS_TYPE_JJCP.equals(goodType)) {
- // 设置现金产品
- achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
- } else if (orderItem.getPayMethod().equals(Dictionary.PAY_TYPE_MOENY)
- && (Dictionary.SHOPPING_GOODS_TYPE_TC.equals(goodType)
- || Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(goodType)
- || Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(goodType)
- || Dictionary.SHOPPING_GOODS_TYPE_TCK.equals(goodType))) {
- // 设置卡项
+ if (Dictionary.ACHIEVE_TYPE_CASH.equals(achieveNew.getT3())){
achieveNew.setCardCash(Double.parseDouble(achieveNew.getT1()));
- } else if (!orderItem.getPayMethod().equals(Dictionary.PAY_TYPE_CARD)) {
+ } else {
// 设置划扣金额
achieveNew.setConsume(Double.parseDouble(achieveNew.getT1()));
}
--
Gitblit v1.9.1