From cf6b7d7ebd13d2b6fe131112b92f5c607bebd868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 17:14:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 16e7442..57e53ef 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -85,7 +85,7 @@
Integer objectType = UserExt.getUser().getObjectType();
System.out.println(objectType);
model.addAttribute("userType",objectType);
- return PREFIX + "TQuestionAdd.html";
+ return PREFIX + "TCouponAdd.html";
}
@RequestMapping("/coupon_record/{id}")
@@ -216,6 +216,9 @@
ofSearch.setUserPopulation(userPopulation);
ofSearch.setStatus(status);
ofSearch.setState(state);
+ if (UserExt.getUser().getObjectType()==3) {
+ ofSearch.setStoreId(UserExt.getUser().getObjectId());
+ }
return client.getCouponListOfSearch(ofSearch);
}
@@ -236,8 +239,11 @@
ofSearch.setState(state);
ofSearch.setCityCode(cityCode);
ofSearch.setStoreId(storeId);
- return client.getCouponListOfSearch(ofSearch);
+ return client.getCouponListOfSearch1(ofSearch);
}
+
+
+
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
--
Gitblit v1.7.1