From 30c2ee7f4e4404063f99b7d6b8d05e5d4cd51e21 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 06 Apr 2021 18:29:30 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 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 8e21a83..3b7c40e 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
@@ -1,8 +1,12 @@
package com.matrix.system.shopXcx.mqTask;
-import com.matrix.biz.service.BizUserService;
+import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
+import com.matrix.system.common.bean.BusParameterSettings;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.score.constant.ScoreSettingConstant;
import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.bean.ShopOrder;
@@ -15,6 +19,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -30,10 +35,15 @@
ShopOrderDetailsDao shopOrderDetailsDao;
@Autowired
- BizUserService bizUserService;
+ SysVipInfoService sysVipInfoService;
+
+
@Autowired
ScoreVipDetailService scoreVipDetailService;
+
+ @Autowired
+ BusParameterSettingsDao busParameterSettingsDao;
@@ -48,30 +58,40 @@
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);
- }
- //消费获得积分
- 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(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;
+ BusParameterSettings cashConsumptionShop = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.CASH_CONSUMPTION_SHOP, order.getCompanyId());
+ for(ShopOrderDetails shopOrderDetail : orderDetails) {
+ if(shopOrderDetail.getPayType()==ShopOrderDetails.PAYTYPE_MICRO){
+ Integer xfkdScore= shopOrderDetail.getShopSku().getScore();
+ if(xfkdScore!=null && xfkdScore>0){
+ addScore+=xfkdScore;
+ }else{
+ if(StringUtils.isNotBlank(cashConsumptionShop.getParamValue())){
+ addScore+= shopOrderDetail.getTotalPrice().divide(new BigDecimal(cashConsumptionShop.getParamValue())).intValue();
+ }
+ }
+ }
+ }
+ if(addScore>0){
+ //插入新的积分
+ scoreVipDetailService.addScore(
+ order.getUserId(),
+ 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