From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
index 1b3ab19..718edc8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
@@ -3,12 +3,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
+import com.dsh.course.feignClient.account.StoreStaffClient;
import com.dsh.course.feignClient.account.model.CityManager;
import com.dsh.course.feignClient.account.model.QueryByNamePhone;
import com.dsh.course.feignClient.account.model.TAppUser;
+import com.dsh.course.feignClient.account.model.TStoreStaff;
import com.dsh.course.feignClient.activity.CouponClient;
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.activity.model.*;
@@ -22,6 +25,8 @@
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.util.OBSUploadUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
+import net.bytebuddy.asm.Advice;
+import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -64,6 +69,8 @@
@Resource
private PointMercharsClient pointMercharsClient;
+ @Autowired
+ private StoreStaffClient storeStaffClient;
/**
* 跳转到优惠券管理首页
@@ -134,6 +141,8 @@
integralGoodsOfSearch.setActiveStatus(activeStatus);
integralGoodsOfSearch.setState(state);
integralGoodsOfSearch.setPage(page);
+ integralGoodsOfSearch.setObjType(UserExt.getUser().getObjectType());
+ integralGoodsOfSearch.setObjId(UserExt.getUser().getObjectId());
return pointMercharsClient.ticketList(integralGoodsOfSearch);
}
@@ -340,8 +349,30 @@
System.out.println(b);
return new SuccessTip<>();
}
-
-
+ /**
+ * 上下架处理操作
+ * @return
+ */
+ @RequestMapping("/writeOff")
+ @ResponseBody
+ public Object writeOff(String id) {
+ Long aLong = Long.valueOf(id);
+ WriteOffDTO dto = new WriteOffDTO();
+ // 核销人员id
+ Integer objectId = UserExt.getUser().getId();
+ if (UserExt.getUser().getObjectType() == 1){
+ dto.setVerifiStoreId(null);
+ }else if (UserExt.getUser().getObjectType() == 2){
+ storeService.getOne(new QueryWrapper<TStore>().eq("cityManagerId",objectId));
+ }else{
+ TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(objectId);
+ dto.setVerifiStoreId(storeByStoreStaffId.getStoreId());
+ }
+ dto.setId(aLong);
+ dto.setVerificationUserId(objectId);
+ pointMercharsClient.writeOff(dto);
+ return new SuccessTip<>();
+ }
/**
* 购买详情
--
Gitblit v1.7.1