From 9ee92c174150ce862132b519451a7c8df3b63342 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 27 十月 2023 12:48:24 +0800
Subject: [PATCH] 商户认证
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 d122000..27970bc 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
@@ -239,6 +239,11 @@
collect.add(-1);
}
if(collect.contains(ofSearch.getStoreId())){
+ if(collect.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
mapList.add(map);
}
}
@@ -287,11 +292,14 @@
Object endTime = stringObjectMap.get("endTime");
stringObjectMap.put("timeValue",startTime + "至"+endTime);
Integer publisherType = (Integer) stringObjectMap.get("publisherType");
- if ( publisherType == 1) {
- Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
- TCityManager byId = citClient.getById(cityManagerId);
- stringObjectMap.put("province", byId.getProvince());
- stringObjectMap.put("city", byId.getCity());
+ if (publisherType!=null) {
+ if (publisherType == 1) {
+ Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
+ TCityManager byId = citClient.getById(cityManagerId);
+ stringObjectMap.put("province", byId.getProvince());
+
+ stringObjectMap.put("city", byId.getCity());
+ }
}
}
}
@@ -499,6 +507,14 @@
coupon.setPublisherType(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+ if (dataVo.getUserType()==1){
+ coupon.setAuditStatus(2);
+ }else{
+ coupon.setAuditStatus(1);
+ }
boolean save = couponService.save(coupon);
if (save){
if (dataVo.getCompany() == 3){
--
Gitblit v1.7.1