From 17e883cb8fd7c5e036e92860c6b13d2e1adff710 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 22 Mar 2021 12:53:14 +0800
Subject: [PATCH] 积分商城14
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java
index 2dfe1d5..62ba032 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java
@@ -50,28 +50,30 @@
//扣除积分
if(order.getScorePay()!=null){
scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
- }
- //消费获得积分
- orderDetails.forEach(shopOrderDetail -> {
+ }else{
+ //消费获得积分
int addScore=0;
- if(shopOrderDetail.getPayType()==ShopOrderDetails.PAYTYPE_MICRO){
- Integer xfkdScore= shopOrderDetail.getShopSku().getScore();
- if(xfkdScore!=null && xfkdScore>0){
- addScore+=xfkdScore;
- }
+ for(ShopOrderDetails shopOrderDetail : orderDetails) {
+ if(shopOrderDetail.getPayType()==ShopOrderDetails.PAYTYPE_MICRO){
+ Integer xfkdScore= shopOrderDetail.getShopSku().getScore();
+ if(xfkdScore!=null && xfkdScore>0){
+ addScore+=xfkdScore;
+ }
+ }
}
if(addScore>0){
//插入新的积分
scoreVipDetailService.addScore(
order.getUserId(),null,
null,
- Long.parseLong(order.getStoreId()+""),
+ Long.parseLong(order.getStoreId()+""),
addScore,
Long.parseLong(orderId+""),
ScoreVipDetail.SCORE_VIP_TYPE_CASH,
"微商城消费");
}
- });
+ }
+
}
--
Gitblit v1.9.1