From 74b87dd114903b48678b3f55853cb518807fca22 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 十一月 2023 19:51:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 4adfd22..8f70ff6 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -305,6 +305,7 @@
@PostMapping("/base/coupon/queryCouponListSearch")
public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+
List<Map<String, Object>> mapList = new ArrayList<>();
if (ofSearch.getStoreIds()==null){
ArrayList<Integer> list = new ArrayList<>();
@@ -646,6 +647,7 @@
if (dataVo.getUserType() == 2){
coupon.setPublisherType(1);
coupon.setAuditStatus(1);
+ coupon.setCityManagerId(dataVo.getCityManagerId());
}
if (dataVo.getUserType() == 3){
coupon.setPublisherType(3);
--
Gitblit v1.7.1