From c6a93bdf8cee5ac0878fa772b6362c499c62795f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 22 Mar 2021 13:04:25 +0800
Subject: [PATCH] 积分商城15
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java | 4 ++--
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
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 940691a..9002b42 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
@@ -54,7 +54,7 @@
* 扣除用户积分
*/
@Transactional(rollbackFor = Exception.class)
- public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type) {
+ public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type,String remark) {
Long companyId=null;
if(openId!=null){
companyId= bizUserDao.findByOpenId(openId).getCompanyId();
@@ -103,6 +103,7 @@
scoreUseRecord.setShopId(shopId);
scoreUseRecord.setOpenId(openId);
scoreUseRecord.setVipId(vipId);
+ scoreUseRecord.setRemarks(remark);
scoreUseRecordDao.insert(scoreUseRecord);
if(surplus > 0 || surplus == 0){
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 62ba032..f099fdc 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
@@ -48,8 +48,8 @@
List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
order.setDetails(orderDetails);
//扣除积分
- if(order.getScorePay()!=null){
- scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
+ if(order.getScorePay()!=null&&order.getScorePay()>0){
+ scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH,"商城积分抵扣");
}else{
//消费获得积分
int addScore=0;
--
Gitblit v1.9.1