From a17a3616fb0b59d61cda0f97c5005c18d97cdbee Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 22 Mar 2021 12:46:28 +0800
Subject: [PATCH] 积分商城13
---
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java | 2 +-
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java | 28 ++++++++++++++--------------
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java | 2 +-
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 3 ++-
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
index 6b2b90f..41cc47b 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
@@ -25,7 +25,7 @@
*/
- private Integer recType;
+ private Integer type;
/**
* 数量
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
index 33ff3ca..8c6b859 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
@@ -99,7 +99,7 @@
*/
- private String businessId;
+ private Long businessId;
/**
* 所属公司_id
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
index b4c3651..b62012f 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
@@ -152,6 +152,7 @@
scoreVipDetail.setState(ScoreVipDetail.SCORE_STATUS_YX);
scoreVipDetail.setRemainScore(score);
scoreVipDetail.setUsedScore(0);
+ scoreVipDetail.setBusinessId(businessId);
scoreVipDetail.setValiditeTime(sxys);
scoreVipDetail.setOpenId(openId);
scoreVipDetail.setVipId(vipId);
@@ -173,7 +174,7 @@
scoreUseRecord.setScoreVipDetailId(scoreVipDetail.getId());
scoreUseRecord.setBusinessId(businessId);
scoreUseRecord.setRecNum(score);
- scoreUseRecord.setRecType(type);
+ scoreUseRecord.setType(type);
scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
scoreUseRecord.setShopId(shopId);
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..8e21a83 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
@@ -52,26 +52,26 @@
scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
}
//消费获得积分
- orderDetails.forEach(shopOrderDetail -> {
- int addScore=0;
+ int addScore=0;
+ 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()+""),
- addScore,
- Long.parseLong(orderId+""),
- ScoreVipDetail.SCORE_VIP_TYPE_CASH,
- "微商城消费");
- }
- });
+ }
+ if(addScore>0){
+ //插入新的积分
+ scoreVipDetailService.addScore(
+ order.getUserId(),null,
+ null,
+ Long.parseLong(order.getStoreId()+""),
+ addScore,
+ Long.parseLong(orderId+""),
+ ScoreVipDetail.SCORE_VIP_TYPE_CASH,
+ "微商城消费");
+ }
}
--
Gitblit v1.9.1