From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index c0feb9d..f91cbfd 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -372,7 +372,7 @@
sysOrderFlowDao.deleteByOrderId(id);
//删除积分
- scoreVipDetailService.removeByBusinessId(null,order.getVipId(), order.getId());
+ scoreVipDetailService.removeByBusinessId(order.getVipId(), order.getId());
// 取消订单
order.setStatu(Dictionary.ORDER_STATU_YQX);
@@ -617,7 +617,7 @@
//添加自己的积分
if(selfScore>0){
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
vipInfo.getId(),
pageOrder.getStaffId(),
pageOrder.getShopId(),
@@ -632,7 +632,7 @@
//推荐注册老带新积分奖励
SysVipInfo referrerVip = sysVipInfoDao.selectById(vipInfo.getRecommendId());
if(parentScore>0){
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
referrerVip.getId(),
pageOrder.getStaffId(),
pageOrder.getShopId(),
@@ -646,7 +646,7 @@
if(referrerVip.getRecommendId()!=null){
SysVipInfo topVipInfo = sysVipInfoDao.selectById(referrerVip.getRecommendId());
if(topParentScore>0){
- scoreVipDetailService.addScore(null,
+ scoreVipDetailService.addScore(
topVipInfo.getId(),
pageOrder.getStaffId(),
pageOrder.getShopId(),
@@ -1459,7 +1459,7 @@
//退款退套餐退项目
refundProjUse(sysOrder);
//删除积分
- scoreVipDetailService.removeByBusinessId(null,oldOrder.getVipId(), oldOrder.getId());
+ scoreVipDetailService.removeByBusinessId(oldOrder.getVipId(), oldOrder.getId());
// 设置业绩
achieveNewService.addAchaeveByOrder(sysOrder);
--
Gitblit v1.9.1