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/service/ScoreVipDetailService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 0c44570..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
@@ -118,7 +118,7 @@
      * 新增用户积分
      */
     @Transactional(rollbackFor = Exception.class)
-    public void addScore(String openId, Long vipId, Long oprationUserId,Long shopId, Integer score, Long businessId, int type) {
+    public void addScore(String openId, Long vipId, Long oprationUserId,Long shopId, Integer score, Long businessId, int type,String remark) {
         Long companyId=null;
         if(openId!=null){
             companyId= bizUserDao.findByOpenId(openId).getCompanyId();
@@ -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,11 +174,12 @@
         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);
         scoreUseRecord.setOprationUserId(oprationUserId);
+        scoreUseRecord.setRemarks(remark);
         scoreUseRecordDao.insert(scoreUseRecord);
 
 
@@ -221,8 +223,23 @@
         });
     }
 
-    public static void main(String[] args) {
-        System.out.println(DateTime.now().isAfter(DateTime.of("2020-11-11 23:22","yyyy-MM-dd HH:mm")));
+    public void removeByBusinessId(String openId, Long vipId,  Long oldBusinessId, int type){
+        Long companyId=null;
+        if(openId!=null){
+            companyId= bizUserDao.findByOpenId(openId).getCompanyId();
+        }else if(vipId!=null){
+            companyId= vipInfoDao.selectById(vipId).getCompanyId();
+        }else{
+            throw new IllegalArgumentException("vipId,openId必须有一个");
+        }
+        if(oldBusinessId==null){
+            throw new IllegalArgumentException("oldBusinessId必须有");
+        }
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("business_id",oldBusinessId);
+        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq("type",type);
+        scoreVipDetailDao.delete(queryWrapper);
+        scoreUseRecordDao.delete(queryWrapper);
     }
-
 }
\ No newline at end of file

--
Gitblit v1.9.1