Browse Source

接口文档更新

ytf 3 years ago
parent
commit
86df948bbf

+ 6 - 6
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/BiddingPayController.java

@@ -7,8 +7,8 @@ import java.util.Map;
7
 import io.swagger.annotations.Api;
7
 import io.swagger.annotations.Api;
8
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.context.annotation.Scope;
9
 import org.springframework.context.annotation.Scope;
10
-import org.springframework.web.bind.annotation.GetMapping;
11
-import org.springframework.web.bind.annotation.PostMapping;
10
+import org.springframework.web.bind.annotation.RequestMapping;
11
+import org.springframework.web.bind.annotation.RequestMapping;
12
 import org.springframework.web.bind.annotation.RequestMapping;
12
 import org.springframework.web.bind.annotation.RequestMapping;
13
 import org.springframework.web.bind.annotation.RestController;
13
 import org.springframework.web.bind.annotation.RestController;
14
 import com.alibaba.fastjson.JSONObject;
14
 import com.alibaba.fastjson.JSONObject;
@@ -38,7 +38,7 @@ public class BiddingPayController extends ProjBaseAction {
38
 	@Autowired
38
 	@Autowired
39
 	private SessionPersionService sessionPersionService;
39
 	private SessionPersionService sessionPersionService;
40
 
40
 
41
-	@PostMapping("/compete_price")
41
+	@RequestMapping("/compete_price")
42
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
42
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
43
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
43
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
44
 
44
 
@@ -52,7 +52,7 @@ public class BiddingPayController extends ProjBaseAction {
52
 		return result.toJSONString();
52
 		return result.toJSONString();
53
 	}
53
 	}
54
 
54
 
55
-	@PostMapping("/apply")
55
+	@RequestMapping("/apply")
56
 	public String apply(String item_kid) {
56
 	public String apply(String item_kid) {
57
 
57
 
58
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
58
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
@@ -66,13 +66,13 @@ public class BiddingPayController extends ProjBaseAction {
66
 		return result.toJSONString();
66
 		return result.toJSONString();
67
 	}
67
 	}
68
 
68
 
69
-	@GetMapping("/check_is_login")
69
+	@RequestMapping("/check_is_login")
70
 	public String check_is_login() {
70
 	public String check_is_login() {
71
 		result.put("loginVar", true);
71
 		result.put("loginVar", true);
72
 		return result.toJSONString();
72
 		return result.toJSONString();
73
 	}
73
 	}
74
 
74
 
75
-	@PostMapping("/check_is_pay")
75
+	@RequestMapping("/check_is_pay")
76
 	public String check_is_pay(String pm_item_id, String pm_user_id) {
76
 	public String check_is_pay(String pm_item_id, String pm_user_id) {
77
 
77
 
78
 		// 查询当前人员是否有t_pm_item_submit信息
78
 		// 查询当前人员是否有t_pm_item_submit信息

+ 16 - 17
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/LotteryController.java

@@ -1,19 +1,8 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.util.List;
4
-import java.util.Map;
5
-
6
-import io.swagger.annotations.Api;
7
-import io.swagger.annotations.ApiOperation;
8
-import org.springframework.beans.factory.annotation.Autowired;
9
-import org.springframework.context.annotation.Scope;
10
-import org.springframework.web.bind.annotation.GetMapping;
11
-import org.springframework.web.bind.annotation.RequestMapping;
12
-import org.springframework.web.bind.annotation.RestController;
13
-import org.tmsps.ne4spring.utils.ChkUtil;
14
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
15
-import com.ydw.yunbuyer.api.user.api.LotteryPersionApi;
16
 import com.ydw.yunbuyer.api.user.api.LotteryApi;
4
 import com.ydw.yunbuyer.api.user.api.LotteryApi;
5
+import com.ydw.yunbuyer.api.user.api.LotteryPersionApi;
17
 import com.ydw.yunbuyer.api.user.api.PersionApi;
6
 import com.ydw.yunbuyer.api.user.api.PersionApi;
18
 import com.ydw.yunbuyer.api.user.entity.LotteryPersion;
7
 import com.ydw.yunbuyer.api.user.entity.LotteryPersion;
19
 import com.ydw.yunbuyer.api.user.entity.LotteryRaffle;
8
 import com.ydw.yunbuyer.api.user.entity.LotteryRaffle;
@@ -22,6 +11,16 @@ import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
22
 import com.ydw.yunbuyer.web.pm.base.Tip;
11
 import com.ydw.yunbuyer.web.pm.base.Tip;
23
 import com.ydw.yunbuyer.web.pm.utils.OrderTools;
12
 import com.ydw.yunbuyer.web.pm.utils.OrderTools;
24
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
13
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
14
+import io.swagger.annotations.Api;
15
+import io.swagger.annotations.ApiOperation;
16
+import org.springframework.beans.factory.annotation.Autowired;
17
+import org.springframework.context.annotation.Scope;
18
+import org.springframework.web.bind.annotation.RequestMapping;
19
+import org.springframework.web.bind.annotation.RestController;
20
+import org.tmsps.ne4spring.utils.ChkUtil;
21
+
22
+import java.util.List;
23
+import java.util.Map;
25
 
24
 
26
 /**
25
 /**
27
  * 抽奖
26
  * 抽奖
@@ -53,7 +52,7 @@ public class LotteryController extends ProjBaseAction {
53
 	 * @return
52
 	 * @return
54
 	 */
53
 	 */
55
 	@ApiOperation("微信抽奖")
54
 	@ApiOperation("微信抽奖")
56
-	@GetMapping("/wx_lottery_raffle")
55
+	@RequestMapping("/wx_lottery_raffle")
57
 	public String wx_lottery_raffle() {
56
 	public String wx_lottery_raffle() {
58
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
57
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
59
 		String persion_id = persion.getString("kid");
58
 		String persion_id = persion.getString("kid");
@@ -180,7 +179,7 @@ public class LotteryController extends ProjBaseAction {
180
 	 * @return
179
 	 * @return
181
 	 */
180
 	 */
182
 	@ApiOperation("抽奖")
181
 	@ApiOperation("抽奖")
183
-	@GetMapping("/lottery_raffle")
182
+	@RequestMapping("/lottery_raffle")
184
 	public String lottery_raffle() {
183
 	public String lottery_raffle() {
185
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
184
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
186
 		String persion_id = persion.getString("kid");
185
 		String persion_id = persion.getString("kid");
@@ -259,7 +258,7 @@ public class LotteryController extends ProjBaseAction {
259
 	 * @return
258
 	 * @return
260
 	 */
259
 	 */
261
 	@ApiOperation("查询我的中奖记录")
260
 	@ApiOperation("查询我的中奖记录")
262
-	@GetMapping("/list_lottery")
261
+	@RequestMapping("/list_lottery")
263
 	public String list_lottery() {
262
 	public String list_lottery() {
264
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
263
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
265
 		String persion_id = persion.getString("kid");
264
 		String persion_id = persion.getString("kid");
@@ -274,7 +273,7 @@ public class LotteryController extends ProjBaseAction {
274
 	 * @return
273
 	 * @return
275
 	 */
274
 	 */
276
 	@ApiOperation("查询不是第六名的抽奖信息")
275
 	@ApiOperation("查询不是第六名的抽奖信息")
277
-	@GetMapping("/list_lottery_raffle_count")
276
+	@RequestMapping("/list_lottery_raffle_count")
278
 	public String list_lottery_raffle_count() {
277
 	public String list_lottery_raffle_count() {
279
 		List<Map<String, Object>> list = lotteryServiceApi.list_lottery_raffle_count();
278
 		List<Map<String, Object>> list = lotteryServiceApi.list_lottery_raffle_count();
280
 		result.put("data", list);
279
 		result.put("data", list);
@@ -287,7 +286,7 @@ public class LotteryController extends ProjBaseAction {
287
 	 * @return
286
 	 * @return
288
 	 */
287
 	 */
289
 	@ApiOperation("初始化所有用户抽奖次数")
288
 	@ApiOperation("初始化所有用户抽奖次数")
290
-	@GetMapping("/update_lottery_count")
289
+	@RequestMapping("/update_lottery_count")
291
 	public String update_lottery_count() {
290
 	public String update_lottery_count() {
292
 		lotteryPersionApi.update_lottery_count();
291
 		lotteryPersionApi.update_lottery_count();
293
 		return result.toJSONString();
292
 		return result.toJSONString();

+ 14 - 16
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxAddressController.java

@@ -1,21 +1,19 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.util.List;
4
-import java.util.Map;
5
-
6
-import io.swagger.annotations.Api;
7
-import org.springframework.beans.factory.annotation.Autowired;
8
-import org.springframework.context.annotation.Scope;
9
-import org.springframework.web.bind.annotation.GetMapping;
10
-import org.springframework.web.bind.annotation.PostMapping;
11
-import org.springframework.web.bind.annotation.RequestMapping;
12
-import org.springframework.web.bind.annotation.RestController;
13
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
14
 import com.ydw.yunbuyer.api.user.api.AddressApi;
4
 import com.ydw.yunbuyer.api.user.api.AddressApi;
15
 import com.ydw.yunbuyer.api.user.entity.ReceiveAddress;
5
 import com.ydw.yunbuyer.api.user.entity.ReceiveAddress;
16
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
6
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
17
 import com.ydw.yunbuyer.web.pm.base.Tip;
7
 import com.ydw.yunbuyer.web.pm.base.Tip;
18
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
8
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
9
+import io.swagger.annotations.Api;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.context.annotation.Scope;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RestController;
14
+
15
+import java.util.List;
16
+import java.util.Map;
19
 
17
 
20
 /**
18
 /**
21
  * 地址
19
  * 地址
@@ -35,7 +33,7 @@ public class WxAddressController extends ProjBaseAction {
35
 	@Autowired
33
 	@Autowired
36
 	private AddressApi addressApi;
34
 	private AddressApi addressApi;
37
 
35
 
38
-	@GetMapping("/get_address")
36
+	@RequestMapping("/get_address")
39
 	public String get_address() {
37
 	public String get_address() {
40
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
38
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
41
 		String persion_id = persion.getString("kid");
39
 		String persion_id = persion.getString("kid");
@@ -44,7 +42,7 @@ public class WxAddressController extends ProjBaseAction {
44
 		return result.toJSONString();
42
 		return result.toJSONString();
45
 	}
43
 	}
46
 
44
 
47
-	@PostMapping("/add")
45
+	@RequestMapping("/add")
48
 	public String add(String province, String city, String district, String detail, String user_name,
46
 	public String add(String province, String city, String district, String detail, String user_name,
49
 			String user_mobile, String is_default) {
47
 			String user_mobile, String is_default) {
50
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
48
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -74,7 +72,7 @@ public class WxAddressController extends ProjBaseAction {
74
 		return result.toJSONString();
72
 		return result.toJSONString();
75
 	}
73
 	}
76
 
74
 
77
-	@PostMapping("/update")
75
+	@RequestMapping("/update")
78
 	public String update(String province, String city, String district, String detail, String user_name,
76
 	public String update(String province, String city, String district, String detail, String user_name,
79
 			String user_mobile, String is_default, String kid) {
77
 			String user_mobile, String is_default, String kid) {
80
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
78
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -112,7 +110,7 @@ public class WxAddressController extends ProjBaseAction {
112
 		return result.toJSONString();
110
 		return result.toJSONString();
113
 	}
111
 	}
114
 
112
 
115
-	@PostMapping("/get")
113
+	@RequestMapping("/get")
116
 	public String get(String kid) {
114
 	public String get(String kid) {
117
 		ReceiveAddress receive_address = addressApi.get(kid);
115
 		ReceiveAddress receive_address = addressApi.get(kid);
118
 
116
 
@@ -120,7 +118,7 @@ public class WxAddressController extends ProjBaseAction {
120
 		return result.toJSONString();
118
 		return result.toJSONString();
121
 	}
119
 	}
122
 
120
 
123
-	@PostMapping("/delete")
121
+	@RequestMapping("/delete")
124
 	public String delete(String kid) {
122
 	public String delete(String kid) {
125
 		ReceiveAddress receive_address = addressApi.get(kid);
123
 		ReceiveAddress receive_address = addressApi.get(kid);
126
 		addressApi.delete(receive_address);
124
 		addressApi.delete(receive_address);
@@ -128,7 +126,7 @@ public class WxAddressController extends ProjBaseAction {
128
 		return result.toJSONString();
126
 		return result.toJSONString();
129
 	}
127
 	}
130
 
128
 
131
-	@PostMapping("/update_is_default")
129
+	@RequestMapping("/update_is_default")
132
 	public String update_is_default(String kid) {
130
 	public String update_is_default(String kid) {
133
 
131
 
134
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
132
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();

+ 27 - 29
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxItemController.java

@@ -1,21 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.io.IOException;
4
-import java.text.ParseException;
5
-import java.util.Date;
6
-import java.util.List;
7
-import java.util.Map;
8
-
9
-import io.swagger.annotations.Api;
10
-import io.swagger.annotations.ApiOperation;
11
-import org.apache.http.client.ClientProtocolException;
12
-import org.springframework.beans.factory.annotation.Autowired;
13
-import org.springframework.context.annotation.Scope;
14
-import org.springframework.web.bind.annotation.PostMapping;
15
-import org.springframework.web.bind.annotation.RequestMapping;
16
-import org.springframework.web.bind.annotation.RestController;
17
-import org.tmsps.ne4spring.utils.DateTools;
18
-
19
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
20
 import com.ydw.yunbuyer.common.utils.ChkTools;
4
 import com.ydw.yunbuyer.common.utils.ChkTools;
21
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
5
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
@@ -28,6 +12,20 @@ import com.ydw.yunbuyer.web.pm.service.PmItemService;
28
 import com.ydw.yunbuyer.web.pm.service.WxItemService;
12
 import com.ydw.yunbuyer.web.pm.service.WxItemService;
29
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
13
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
30
 import com.ydw.yunbuyer.web.pm.web.WebTools;
14
 import com.ydw.yunbuyer.web.pm.web.WebTools;
15
+import io.swagger.annotations.Api;
16
+import io.swagger.annotations.ApiOperation;
17
+import org.apache.http.client.ClientProtocolException;
18
+import org.springframework.beans.factory.annotation.Autowired;
19
+import org.springframework.context.annotation.Scope;
20
+import org.springframework.web.bind.annotation.RequestMapping;
21
+import org.springframework.web.bind.annotation.RestController;
22
+import org.tmsps.ne4spring.utils.DateTools;
23
+
24
+import java.io.IOException;
25
+import java.text.ParseException;
26
+import java.util.Date;
27
+import java.util.List;
28
+import java.util.Map;
31
 
29
 
32
 /**
30
 /**
33
  * 店铺拍品
31
  * 店铺拍品
@@ -53,13 +51,13 @@ public class WxItemController extends ProjBaseAction {
53
 	@Autowired
51
 	@Autowired
54
 	private LiveRoomService liveRoomService;
52
 	private LiveRoomService liveRoomService;
55
 
53
 
56
-	@PostMapping("/new_add_item")
54
+	@RequestMapping("/new_add_item")
57
 	public String new_add_item(t_project_item project_item) throws ParseException {
55
 	public String new_add_item(t_project_item project_item) throws ParseException {
58
 		wxItemService.add(project_item);
56
 		wxItemService.add(project_item);
59
 		return result.toJSONString();
57
 		return result.toJSONString();
60
 	}
58
 	}
61
 
59
 
62
-	@PostMapping("/new_update_item")
60
+	@RequestMapping("/new_update_item")
63
 	public String new_update_item(t_project_item project_item) throws ParseException {
61
 	public String new_update_item(t_project_item project_item) throws ParseException {
64
 		t_project_item project_itemDb = wxItemService.get(project_item.getKid());
62
 		t_project_item project_itemDb = wxItemService.get(project_item.getKid());
65
 		project_itemDb.setBid_type(project_item.getBid_type());
63
 		project_itemDb.setBid_type(project_item.getBid_type());
@@ -91,7 +89,7 @@ public class WxItemController extends ProjBaseAction {
91
 	 * @return
89
 	 * @return
92
 	 */
90
 	 */
93
 	@ApiOperation("获取标的物信息")
91
 	@ApiOperation("获取标的物信息")
94
-	@PostMapping("/get_item")
92
+	@RequestMapping("/get_item")
95
 	public String get_item(String item_kid) {
93
 	public String get_item(String item_kid) {
96
 		t_project_item project_item = wxItemService.get(item_kid);
94
 		t_project_item project_item = wxItemService.get(item_kid);
97
 		result.put("data", project_item);
95
 		result.put("data", project_item);
@@ -105,7 +103,7 @@ public class WxItemController extends ProjBaseAction {
105
 	 * @return
103
 	 * @return
106
 	 */
104
 	 */
107
 	@ApiOperation("删除标的物")
105
 	@ApiOperation("删除标的物")
108
-	@PostMapping("/del_item")
106
+	@RequestMapping("/del_item")
109
 	public String del_item(String item_kid) {
107
 	public String del_item(String item_kid) {
110
 		wxItemService.deleteById(item_kid);
108
 		wxItemService.deleteById(item_kid);
111
 		return result.toJSONString();
109
 		return result.toJSONString();
@@ -118,7 +116,7 @@ public class WxItemController extends ProjBaseAction {
118
 	 * @return
116
 	 * @return
119
 	 */
117
 	 */
120
 	@ApiOperation("所有标的物")
118
 	@ApiOperation("所有标的物")
121
-	@PostMapping("list_all_item")
119
+	@RequestMapping("list_all_item")
122
 	public String list_all_item(String shop_id) {
120
 	public String list_all_item(String shop_id) {
123
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_wait_verify(shop_id));
121
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_wait_verify(shop_id));
124
 		List<Map<String, Object>> list1 = ChkTools.getFileId(wxItemService.list_item_verify_pass(shop_id));
122
 		List<Map<String, Object>> list1 = ChkTools.getFileId(wxItemService.list_item_verify_pass(shop_id));
@@ -137,7 +135,7 @@ public class WxItemController extends ProjBaseAction {
137
 	 * @return
135
 	 * @return
138
 	 */
136
 	 */
139
 	@ApiOperation("查询正在等待审核的标的物")
137
 	@ApiOperation("查询正在等待审核的标的物")
140
-	@PostMapping("/list_item_wait_verify")
138
+	@RequestMapping("/list_item_wait_verify")
141
 	public String list_item_wait_verify(String shop_id) {
139
 	public String list_item_wait_verify(String shop_id) {
142
 
140
 
143
 		List<Map<String, Object>> list = wxItemService.list_item_wait_verify(shop_id);
141
 		List<Map<String, Object>> list = wxItemService.list_item_wait_verify(shop_id);
@@ -152,7 +150,7 @@ public class WxItemController extends ProjBaseAction {
152
 	 * @return
150
 	 * @return
153
 	 */
151
 	 */
154
 	@ApiOperation("查询审核通过的标的物")
152
 	@ApiOperation("查询审核通过的标的物")
155
-	@PostMapping("/list_item_verify_pass")
153
+	@RequestMapping("/list_item_verify_pass")
156
 	public String list_item_verify_pass(String shop_id) {
154
 	public String list_item_verify_pass(String shop_id) {
157
 		List<Map<String, Object>> list = wxItemService.list_item_verify_pass(shop_id);
155
 		List<Map<String, Object>> list = wxItemService.list_item_verify_pass(shop_id);
158
 		result.put("data", list);
156
 		result.put("data", list);
@@ -166,7 +164,7 @@ public class WxItemController extends ProjBaseAction {
166
 	 * @return
164
 	 * @return
167
 	 */
165
 	 */
168
 	@ApiOperation("查询审核通过的标的物")
166
 	@ApiOperation("查询审核通过的标的物")
169
-	@PostMapping("/list_live_item_verify_pass")
167
+	@RequestMapping("/list_live_item_verify_pass")
170
 	public String list_live_item_verify_pass(String shop_id) {
168
 	public String list_live_item_verify_pass(String shop_id) {
171
 		List<Map<String, Object>> list = wxItemService.list_live_item_verify_pass(shop_id);
169
 		List<Map<String, Object>> list = wxItemService.list_live_item_verify_pass(shop_id);
172
 		result.put("data", list);
170
 		result.put("data", list);
@@ -180,7 +178,7 @@ public class WxItemController extends ProjBaseAction {
180
 	 * @return
178
 	 * @return
181
 	 */
179
 	 */
182
 	@ApiOperation("查询审核拒绝的标的物")
180
 	@ApiOperation("查询审核拒绝的标的物")
183
-	@PostMapping("/list_item_verify_reject")
181
+	@RequestMapping("/list_item_verify_reject")
184
 	public String list_item_verify_reject(String shop_id) {
182
 	public String list_item_verify_reject(String shop_id) {
185
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_verify_reject(shop_id));
183
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_verify_reject(shop_id));
186
 		result.put("data", list);
184
 		result.put("data", list);
@@ -194,7 +192,7 @@ public class WxItemController extends ProjBaseAction {
194
 	 * @return
192
 	 * @return
195
 	 */
193
 	 */
196
 	@ApiOperation("点击关拍开始倒计时,返回系统当前时间")
194
 	@ApiOperation("点击关拍开始倒计时,返回系统当前时间")
197
-	@PostMapping("/start_countdown")
195
+	@RequestMapping("/start_countdown")
198
 	public String start_countdown(String item_kid) {
196
 	public String start_countdown(String item_kid) {
199
 		long nowtime = System.currentTimeMillis();
197
 		long nowtime = System.currentTimeMillis();
200
 		result.put("nowtime", nowtime);
198
 		result.put("nowtime", nowtime);
@@ -212,7 +210,7 @@ public class WxItemController extends ProjBaseAction {
212
 	 * @return
210
 	 * @return
213
 	 */
211
 	 */
214
 	@ApiOperation("倒计时每秒获取是否有竞价记录")
212
 	@ApiOperation("倒计时每秒获取是否有竞价记录")
215
-	@PostMapping("/get_countdown")
213
+	@RequestMapping("/get_countdown")
216
 	public String get_countdown(long start_time, String item_kid) {
214
 	public String get_countdown(long start_time, String item_kid) {
217
 		List<Map<String, Object>> list = wxItemService.select_offer(start_time, item_kid);
215
 		List<Map<String, Object>> list = wxItemService.select_offer(start_time, item_kid);
218
 		if (list.size() > 0) {
216
 		if (list.size() > 0) {
@@ -231,7 +229,7 @@ public class WxItemController extends ProjBaseAction {
231
 	 * @return
229
 	 * @return
232
 	 */
230
 	 */
233
 	@ApiOperation("更改直播拍品状态")
231
 	@ApiOperation("更改直播拍品状态")
234
-	@PostMapping("/bidding_status")
232
+	@RequestMapping("/bidding_status")
235
 	public String bidding_opening(String item_kid, boolean is_open) {
233
 	public String bidding_opening(String item_kid, boolean is_open) {
236
 		String s = is_open ? "开拍" : "关拍";
234
 		String s = is_open ? "开拍" : "关拍";
237
 		wxItemService.pm_update_status(item_kid, is_open);
235
 		wxItemService.pm_update_status(item_kid, is_open);
@@ -278,7 +276,7 @@ public class WxItemController extends ProjBaseAction {
278
 	 * @return
276
 	 * @return
279
 	 */
277
 	 */
280
 	@ApiOperation("查询已卖出未发货的宝贝")
278
 	@ApiOperation("查询已卖出未发货的宝贝")
281
-	@PostMapping("/is_delived")
279
+	@RequestMapping("/is_delived")
282
 	public String is_delived() {
280
 	public String is_delived() {
283
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
281
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
284
 		String shop_id = json.getString("shop_id");
282
 		String shop_id = json.getString("shop_id");

+ 23 - 25
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxLiveRoomController.java

@@ -1,18 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.math.BigDecimal;
4
-import java.util.List;
5
-import java.util.Map;
6
-
7
-import io.swagger.annotations.Api;
8
-import io.swagger.annotations.ApiOperation;
9
-import org.springframework.beans.factory.annotation.Autowired;
10
-import org.springframework.context.annotation.Scope;
11
-import org.springframework.web.bind.annotation.PostMapping;
12
-import org.springframework.web.bind.annotation.RequestMapping;
13
-import org.springframework.web.bind.annotation.RestController;
14
-import org.tmsps.ne4spring.utils.ChkUtil;
15
-
16
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
17
 import com.ydw.yunbuyer.api.user.api.PersionApi;
4
 import com.ydw.yunbuyer.api.user.api.PersionApi;
18
 import com.ydw.yunbuyer.api.user.entity.Persion;
5
 import com.ydw.yunbuyer.api.user.entity.Persion;
@@ -27,6 +14,17 @@ import com.ydw.yunbuyer.web.pm.service.LiveRoomService;
27
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
14
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
28
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
15
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
29
 import com.ydw.yunbuyer.web.pm.web.WebTools;
16
 import com.ydw.yunbuyer.web.pm.web.WebTools;
17
+import io.swagger.annotations.Api;
18
+import io.swagger.annotations.ApiOperation;
19
+import org.springframework.beans.factory.annotation.Autowired;
20
+import org.springframework.context.annotation.Scope;
21
+import org.springframework.web.bind.annotation.RequestMapping;
22
+import org.springframework.web.bind.annotation.RestController;
23
+import org.tmsps.ne4spring.utils.ChkUtil;
24
+
25
+import java.math.BigDecimal;
26
+import java.util.List;
27
+import java.util.Map;
30
 
28
 
31
 /**
29
 /**
32
  * 直播间
30
  * 直播间
@@ -60,7 +58,7 @@ public class WxLiveRoomController extends ProjBaseAction {
60
 	 * @return
58
 	 * @return
61
 	 */
59
 	 */
62
 	@ApiOperation("创建直播间")
60
 	@ApiOperation("创建直播间")
63
-	@PostMapping(value = "/create_live_room")
61
+	@RequestMapping(value = "/create_live_room")
64
 	public String register_shop(String name, String content) {
62
 	public String register_shop(String name, String content) {
65
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
63
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
66
 		String persion_id = json.getString("kid");
64
 		String persion_id = json.getString("kid");
@@ -86,7 +84,7 @@ public class WxLiveRoomController extends ProjBaseAction {
86
 	 * @param shop_id
84
 	 * @param shop_id
87
 	 * @return
85
 	 * @return
88
 	 */
86
 	 */
89
-	@PostMapping("/check_live_room")
87
+	@RequestMapping("/check_live_room")
90
 	public String check_live_room(String shop_id) {
88
 	public String check_live_room(String shop_id) {
91
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
89
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
92
 
90
 
@@ -112,7 +110,7 @@ public class WxLiveRoomController extends ProjBaseAction {
112
 	 * @return
110
 	 * @return
113
 	 */
111
 	 */
114
 	@ApiOperation("修改直播间")
112
 	@ApiOperation("修改直播间")
115
-	@PostMapping(value = "/update_live_room")
113
+	@RequestMapping(value = "/update_live_room")
116
 	public String update_live_room(String live_room_id, String name, String content) {
114
 	public String update_live_room(String live_room_id, String name, String content) {
117
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
115
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
118
 		liveroom.setName(name);
116
 		liveroom.setName(name);
@@ -131,7 +129,7 @@ public class WxLiveRoomController extends ProjBaseAction {
131
 	 * @return
129
 	 * @return
132
 	 */
130
 	 */
133
 	@ApiOperation("获取直播间信息")
131
 	@ApiOperation("获取直播间信息")
134
-	@PostMapping(value = "/get_live_room")
132
+	@RequestMapping(value = "/get_live_room")
135
 	public String get_live_room(String live_room_id) {
133
 	public String get_live_room(String live_room_id) {
136
 
134
 
137
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
135
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
@@ -147,7 +145,7 @@ public class WxLiveRoomController extends ProjBaseAction {
147
 	 * @return
145
 	 * @return
148
 	 */
146
 	 */
149
 	@ApiOperation("删除直播间")
147
 	@ApiOperation("删除直播间")
150
-	@PostMapping(value = "/del_live_room")
148
+	@RequestMapping(value = "/del_live_room")
151
 	public String del_live_room(String live_room_id) {
149
 	public String del_live_room(String live_room_id) {
152
 
150
 
153
 		liveRoomService.deleteById(live_room_id);
151
 		liveRoomService.deleteById(live_room_id);
@@ -162,7 +160,7 @@ public class WxLiveRoomController extends ProjBaseAction {
162
 	 * @return
160
 	 * @return
163
 	 */
161
 	 */
164
 	@ApiOperation("获取审核通过的直播间")
162
 	@ApiOperation("获取审核通过的直播间")
165
-	@PostMapping(value = "/list_verify_pass")
163
+	@RequestMapping(value = "/list_verify_pass")
166
 	public String list_live_room(String shop_id) {
164
 	public String list_live_room(String shop_id) {
167
 
165
 
168
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
166
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
@@ -177,7 +175,7 @@ public class WxLiveRoomController extends ProjBaseAction {
177
 	 * @return
175
 	 * @return
178
 	 */
176
 	 */
179
 	@ApiOperation("获取正在审核的")
177
 	@ApiOperation("获取正在审核的")
180
-	@PostMapping(value = "/list_wait_verify")
178
+	@RequestMapping(value = "/list_wait_verify")
181
 	public String list_wait_verify(String shop_id) {
179
 	public String list_wait_verify(String shop_id) {
182
 		List<Map<String, Object>> list = liveRoomService.list_wait_verify(shop_id);
180
 		List<Map<String, Object>> list = liveRoomService.list_wait_verify(shop_id);
183
 		result.put("data", list);
181
 		result.put("data", list);
@@ -191,7 +189,7 @@ public class WxLiveRoomController extends ProjBaseAction {
191
 	 * @return
189
 	 * @return
192
 	 */
190
 	 */
193
 	@ApiOperation("获取审核未通过")
191
 	@ApiOperation("获取审核未通过")
194
-	@PostMapping(value = "/list_verify_reject")
192
+	@RequestMapping(value = "/list_verify_reject")
195
 	public String list_verify_reject(String shop_id) {
193
 	public String list_verify_reject(String shop_id) {
196
 		List<Map<String, Object>> list = liveRoomService.list_verify_reject(shop_id);
194
 		List<Map<String, Object>> list = liveRoomService.list_verify_reject(shop_id);
197
 		result.put("data", list);
195
 		result.put("data", list);
@@ -205,7 +203,7 @@ public class WxLiveRoomController extends ProjBaseAction {
205
 	 * @return
203
 	 * @return
206
 	 */
204
 	 */
207
 	@ApiOperation("进入直播间详情")
205
 	@ApiOperation("进入直播间详情")
208
-	@PostMapping(value = "/live_room_detail")
206
+	@RequestMapping(value = "/live_room_detail")
209
 	public String live_room_detail(String live_room_id) {
207
 	public String live_room_detail(String live_room_id) {
210
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.live_room_detail(live_room_id));
208
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.live_room_detail(live_room_id));
211
 		if (list.size() > 0) {
209
 		if (list.size() > 0) {
@@ -244,7 +242,7 @@ public class WxLiveRoomController extends ProjBaseAction {
244
 	 * @return
242
 	 * @return
245
 	 */
243
 	 */
246
 	@ApiOperation("获取标的物详情")
244
 	@ApiOperation("获取标的物详情")
247
-	@PostMapping(value = "/get_item_detail")
245
+	@RequestMapping(value = "/get_item_detail")
248
 	public String get_item_detail(String item_kid) {
246
 	public String get_item_detail(String item_kid) {
249
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
247
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
250
 		String pm_user_id = persion.getString("kid");
248
 		String pm_user_id = persion.getString("kid");
@@ -272,7 +270,7 @@ public class WxLiveRoomController extends ProjBaseAction {
272
 		return result.toJSONString();
270
 		return result.toJSONString();
273
 	}
271
 	}
274
 
272
 
275
-	@PostMapping(value = "/get_live_room_item_detail")
273
+	@RequestMapping(value = "/get_live_room_item_detail")
276
 	public String get_live_room_item_detail(String item_kid) {
274
 	public String get_live_room_item_detail(String item_kid) {
277
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.item_detail(item_kid));
275
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.item_detail(item_kid));
278
 		List<Map<String, Object>> offer = pmItemService.select_offer_count(item_kid);
276
 		List<Map<String, Object>> offer = pmItemService.select_offer_count(item_kid);
@@ -284,7 +282,7 @@ public class WxLiveRoomController extends ProjBaseAction {
284
 		return result.toJSONString();
282
 		return result.toJSONString();
285
 	}
283
 	}
286
 
284
 
287
-	@PostMapping(value = "/select_live_item")
285
+	@RequestMapping(value = "/select_live_item")
288
 	public String select_live_item(String live_room_id) {
286
 	public String select_live_item(String live_room_id) {
289
 
287
 
290
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.select_live_item(live_room_id));
288
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.select_live_item(live_room_id));

+ 10 - 11
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxMsgController.java

@@ -1,15 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.io.IOException;
4
-
5
-import io.swagger.annotations.Api;
6
-import org.apache.http.client.ClientProtocolException;
7
-import org.springframework.beans.factory.annotation.Autowired;
8
-import org.springframework.context.annotation.Scope;
9
-import org.springframework.web.bind.annotation.PostMapping;
10
-import org.springframework.web.bind.annotation.RequestMapping;
11
-import org.springframework.web.bind.annotation.RestController;
12
-import org.tmsps.ne4spring.utils.DateTools;
13
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
14
 import com.ydw.yunbuyer.api.user.api.PersionApi;
4
 import com.ydw.yunbuyer.api.user.api.PersionApi;
15
 import com.ydw.yunbuyer.api.user.entity.Persion;
5
 import com.ydw.yunbuyer.api.user.entity.Persion;
@@ -22,6 +12,15 @@ import com.ydw.yunbuyer.web.pm.service.ShopService;
22
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
12
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
23
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
13
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
24
 import com.ydw.yunbuyer.web.pm.web.WebTools;
14
 import com.ydw.yunbuyer.web.pm.web.WebTools;
15
+import io.swagger.annotations.Api;
16
+import org.apache.http.client.ClientProtocolException;
17
+import org.springframework.beans.factory.annotation.Autowired;
18
+import org.springframework.context.annotation.Scope;
19
+import org.springframework.web.bind.annotation.RequestMapping;
20
+import org.springframework.web.bind.annotation.RestController;
21
+import org.tmsps.ne4spring.utils.DateTools;
22
+
23
+import java.io.IOException;
25
 
24
 
26
 /**
25
 /**
27
  * 模板消息
26
  * 模板消息
@@ -50,7 +49,7 @@ public class WxMsgController {
50
 	@Autowired
49
 	@Autowired
51
 	private ShopService shopService;
50
 	private ShopService shopService;
52
 
51
 
53
-	@PostMapping("/push_one_user")
52
+	@RequestMapping("/push_one_user")
54
 	public String pushOneUser(String payno_id, String formId) throws ClientProtocolException, IOException {
53
 	public String pushOneUser(String payno_id, String formId) throws ClientProtocolException, IOException {
55
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
54
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
56
 		t_pay_no pay_no = wxPmService.get_pay_no(payno_id);
55
 		t_pay_no pay_no = wxPmService.get_pay_no(payno_id);

+ 18 - 21
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmApiController.java

@@ -1,21 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.math.BigDecimal;
4
-import java.util.ArrayList;
5
-import java.util.HashMap;
6
-import java.util.List;
7
-import java.util.Map;
8
-
9
-import io.swagger.annotations.Api;
10
-import io.swagger.annotations.ApiOperation;
11
-import org.springframework.beans.factory.annotation.Autowired;
12
-import org.springframework.context.annotation.Scope;
13
-import org.springframework.web.bind.annotation.GetMapping;
14
-import org.springframework.web.bind.annotation.PostMapping;
15
-import org.springframework.web.bind.annotation.RequestMapping;
16
-import org.springframework.web.bind.annotation.RestController;
17
-import org.tmsps.ne4spring.utils.ChkUtil;
18
-
19
 import com.ydw.yunbuyer.api.user.api.PersionApi;
3
 import com.ydw.yunbuyer.api.user.api.PersionApi;
20
 import com.ydw.yunbuyer.api.user.entity.Persion;
4
 import com.ydw.yunbuyer.api.user.entity.Persion;
21
 import com.ydw.yunbuyer.common.utils.ChkTools;
5
 import com.ydw.yunbuyer.common.utils.ChkTools;
@@ -27,6 +11,19 @@ import com.ydw.yunbuyer.web.pm.service.PmItemService;
27
 import com.ydw.yunbuyer.web.pm.service.ShopService;
11
 import com.ydw.yunbuyer.web.pm.service.ShopService;
28
 import com.ydw.yunbuyer.web.pm.service.SlideShowService;
12
 import com.ydw.yunbuyer.web.pm.service.SlideShowService;
29
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
13
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
14
+import io.swagger.annotations.Api;
15
+import io.swagger.annotations.ApiOperation;
16
+import org.springframework.beans.factory.annotation.Autowired;
17
+import org.springframework.context.annotation.Scope;
18
+import org.springframework.web.bind.annotation.RequestMapping;
19
+import org.springframework.web.bind.annotation.RestController;
20
+import org.tmsps.ne4spring.utils.ChkUtil;
21
+
22
+import java.math.BigDecimal;
23
+import java.util.ArrayList;
24
+import java.util.HashMap;
25
+import java.util.List;
26
+import java.util.Map;
30
 
27
 
31
 /**
28
 /**
32
  * 
29
  * 
@@ -55,7 +52,7 @@ public class WxPmApiController extends ProjBaseAction {
55
 	@Autowired
52
 	@Autowired
56
 	private ShopService shopService;
53
 	private ShopService shopService;
57
 
54
 
58
-	@GetMapping("/list_item")
55
+	@RequestMapping("/list_item")
59
 	public String list_item() {
56
 	public String list_item() {
60
 		List<Map<String, Object>> list = pmItemService.list_all_open();
57
 		List<Map<String, Object>> list = pmItemService.list_all_open();
61
 		List<Map<String, Object>> list1 = pmItemService.list_all_not_open();
58
 		List<Map<String, Object>> list1 = pmItemService.list_all_not_open();
@@ -67,7 +64,7 @@ public class WxPmApiController extends ProjBaseAction {
67
 		return result.toJSONString();
64
 		return result.toJSONString();
68
 	}
65
 	}
69
 
66
 
70
-	@GetMapping("/list_slideshow")
67
+	@RequestMapping("/list_slideshow")
71
 	public String list_slideshow() {
68
 	public String list_slideshow() {
72
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
69
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
73
 		result.put("data", list);
70
 		result.put("data", list);
@@ -81,7 +78,7 @@ public class WxPmApiController extends ProjBaseAction {
81
 	 * @return
78
 	 * @return
82
 	 */
79
 	 */
83
 	@ApiOperation("详情页")
80
 	@ApiOperation("详情页")
84
-	@PostMapping("/select_list")
81
+	@RequestMapping("/select_list")
85
 	public String select_list(String kid) {
82
 	public String select_list(String kid) {
86
 		// count.put(kid, );
83
 		// count.put(kid, );
87
 		List<Map<String, Object>> list = pmItemService.select_list(kid);
84
 		List<Map<String, Object>> list = pmItemService.select_list(kid);
@@ -127,14 +124,14 @@ public class WxPmApiController extends ProjBaseAction {
127
 	 * @return
124
 	 * @return
128
 	 */
125
 	 */
129
 	@ApiOperation("增加围观人数")
126
 	@ApiOperation("增加围观人数")
130
-	@PostMapping("/add_circusee_num")
127
+	@RequestMapping("/add_circusee_num")
131
 	public String add_circusee_num(String kid) {
128
 	public String add_circusee_num(String kid) {
132
 		System.out.println(kid);
129
 		System.out.println(kid);
133
 		pmItemService.add_circusee_num(kid);// 增加围观次数
130
 		pmItemService.add_circusee_num(kid);// 增加围观次数
134
 		return result.toJSONString();
131
 		return result.toJSONString();
135
 	}
132
 	}
136
 
133
 
137
-	@PostMapping("/check_item_status")
134
+	@RequestMapping("/check_item_status")
138
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
135
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
139
 
136
 
140
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
137
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);

+ 52 - 73
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -1,28 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.io.IOException;
4
-import java.math.BigDecimal;
5
-import java.util.ArrayList;
6
-import java.util.HashMap;
7
-import java.util.LinkedList;
8
-import java.util.List;
9
-import java.util.Map;
10
-
11
-import com.ydw.yunbuyer.common.base.enums.TimeEnum;
12
-import io.swagger.annotations.Api;
13
-import io.swagger.annotations.ApiOperation;
14
-import org.apache.http.client.ClientProtocolException;
15
-import org.springframework.beans.factory.annotation.Autowired;
16
-import org.springframework.context.annotation.Scope;
17
-import org.springframework.util.StringUtils;
18
-import org.springframework.web.bind.annotation.GetMapping;
19
-import org.springframework.web.bind.annotation.PostMapping;
20
-import org.springframework.web.bind.annotation.RequestMapping;
21
-import org.springframework.web.bind.annotation.RestController;
22
-import org.tmsps.ne4spring.utils.ChkUtil;
23
-import org.tmsps.ne4spring.utils.DateTools;
24
-import org.tmsps.ne4spring.utils.JsonUtil;
25
-
26
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
27
 import com.ydw.yunbuyer.api.system.api.SmsApi;
4
 import com.ydw.yunbuyer.api.system.api.SmsApi;
28
 import com.ydw.yunbuyer.api.user.api.AddressApi;
5
 import com.ydw.yunbuyer.api.user.api.AddressApi;
@@ -30,32 +7,34 @@ import com.ydw.yunbuyer.api.user.api.PersionApi;
30
 import com.ydw.yunbuyer.api.user.api.WxApi;
7
 import com.ydw.yunbuyer.api.user.api.WxApi;
31
 import com.ydw.yunbuyer.api.user.entity.Persion;
8
 import com.ydw.yunbuyer.api.user.entity.Persion;
32
 import com.ydw.yunbuyer.api.user.entity.ReceiveAddress;
9
 import com.ydw.yunbuyer.api.user.entity.ReceiveAddress;
10
+import com.ydw.yunbuyer.common.base.enums.TimeEnum;
33
 import com.ydw.yunbuyer.common.utils.BeanUtils;
11
 import com.ydw.yunbuyer.common.utils.BeanUtils;
34
 import com.ydw.yunbuyer.common.utils.ChkTools;
12
 import com.ydw.yunbuyer.common.utils.ChkTools;
35
 import com.ydw.yunbuyer.common.utils.express.ExpressUtils;
13
 import com.ydw.yunbuyer.common.utils.express.ExpressUtils;
36
 import com.ydw.yunbuyer.common.utils.live.LiveTools;
14
 import com.ydw.yunbuyer.common.utils.live.LiveTools;
37
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
15
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
38
 import com.ydw.yunbuyer.web.pm.base.Tip;
16
 import com.ydw.yunbuyer.web.pm.base.Tip;
39
-import com.ydw.yunbuyer.web.pm.entity.t_classify;
40
-import com.ydw.yunbuyer.web.pm.entity.t_liveroom;
41
-import com.ydw.yunbuyer.web.pm.entity.t_pay_no;
42
-import com.ydw.yunbuyer.web.pm.entity.t_pm_item;
43
-import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit;
44
-import com.ydw.yunbuyer.web.pm.entity.t_pm_item_submit_offer;
45
-import com.ydw.yunbuyer.web.pm.entity.t_pm_offline_apply;
46
-import com.ydw.yunbuyer.web.pm.entity.t_shop;
17
+import com.ydw.yunbuyer.web.pm.entity.*;
47
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
18
 import com.ydw.yunbuyer.web.pm.entity.user.t_receive_address;
48
-import com.ydw.yunbuyer.web.pm.service.LiveRoomService;
49
-import com.ydw.yunbuyer.web.pm.service.PmItemService;
50
-import com.ydw.yunbuyer.web.pm.service.PmProjectItemService;
51
-import com.ydw.yunbuyer.web.pm.service.ShopService;
52
-import com.ydw.yunbuyer.web.pm.service.SlideShowService;
53
-import com.ydw.yunbuyer.web.pm.service.WxPmService;
54
-import com.ydw.yunbuyer.web.pm.service.WxSubmitService;
19
+import com.ydw.yunbuyer.web.pm.service.*;
55
 import com.ydw.yunbuyer.web.pm.utils.OrderTools;
20
 import com.ydw.yunbuyer.web.pm.utils.OrderTools;
56
 import com.ydw.yunbuyer.web.pm.utils.SensitiveWord;
21
 import com.ydw.yunbuyer.web.pm.utils.SensitiveWord;
57
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
22
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
58
 import com.ydw.yunbuyer.web.pm.web.WebTools;
23
 import com.ydw.yunbuyer.web.pm.web.WebTools;
24
+import io.swagger.annotations.Api;
25
+import io.swagger.annotations.ApiOperation;
26
+import org.apache.http.client.ClientProtocolException;
27
+import org.springframework.beans.factory.annotation.Autowired;
28
+import org.springframework.context.annotation.Scope;
29
+import org.springframework.web.bind.annotation.RequestMapping;
30
+import org.springframework.web.bind.annotation.RestController;
31
+import org.tmsps.ne4spring.utils.ChkUtil;
32
+import org.tmsps.ne4spring.utils.DateTools;
33
+import org.tmsps.ne4spring.utils.JsonUtil;
34
+
35
+import java.io.IOException;
36
+import java.math.BigDecimal;
37
+import java.util.*;
59
 
38
 
60
 /**
39
 /**
61
  * 
40
  * 
@@ -114,7 +93,7 @@ public class WxPmController extends ProjBaseAction {
114
 	 * @return
93
 	 * @return
115
 	 */
94
 	 */
116
 	@ApiOperation("发送短信")
95
 	@ApiOperation("发送短信")
117
-	@PostMapping(value = "/send_mobile_wx")
96
+	@RequestMapping(value = "/send_mobile_wx")
118
 	public String send_mobile_wx(String mobile) {
97
 	public String send_mobile_wx(String mobile) {
119
 		if (persionApi.check_mobile(mobile)) {
98
 		if (persionApi.check_mobile(mobile)) {
120
 			String random = ((int) ((Math.random() * 9 + 1) * 1000)) + "";
99
 			String random = ((int) ((Math.random() * 9 + 1) * 1000)) + "";
@@ -139,7 +118,7 @@ public class WxPmController extends ProjBaseAction {
139
 	 * @return
118
 	 * @return
140
 	 */
119
 	 */
141
 	@ApiOperation("检测手机号")
120
 	@ApiOperation("检测手机号")
142
-	@PostMapping(value = "/check_mobile_and_code_wx")
121
+	@RequestMapping(value = "/check_mobile_and_code_wx")
143
 	public String check_mobile_and_code_wx(String mobile, String code) {
122
 	public String check_mobile_and_code_wx(String mobile, String code) {
144
 		Object m = WebTools.getSession().getAttribute(mobile);
123
 		Object m = WebTools.getSession().getAttribute(mobile);
145
 		if (ChkTools.isNull(m)) {
124
 		if (ChkTools.isNull(m)) {
@@ -164,7 +143,7 @@ public class WxPmController extends ProjBaseAction {
164
 	 * @return
143
 	 * @return
165
 	 */
144
 	 */
166
 	@ApiOperation("查询分类")
145
 	@ApiOperation("查询分类")
167
-	@GetMapping(value = "/list_item_classify")
146
+	@RequestMapping(value = "/list_item_classify")
168
 	public String list_item_classify() {
147
 	public String list_item_classify() {
169
 		List<Map<String, Object>> list = pmItemService.list_item_classify();
148
 		List<Map<String, Object>> list = pmItemService.list_item_classify();
170
 		LinkedList<Map<String, Object>> list1 = new LinkedList<Map<String, Object>>();
149
 		LinkedList<Map<String, Object>> list1 = new LinkedList<Map<String, Object>>();
@@ -203,7 +182,7 @@ public class WxPmController extends ProjBaseAction {
203
 	 * @return
182
 	 * @return
204
 	 */
183
 	 */
205
 	@ApiOperation("更新用户信息")
184
 	@ApiOperation("更新用户信息")
206
-	@PostMapping(value = "/update_userinfo")
185
+	@RequestMapping(value = "/update_userinfo")
207
 	public String update_userinfo(String userinfo) {
186
 	public String update_userinfo(String userinfo) {
208
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
187
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
209
 		JSONObject json = JsonUtil.jsonStrToJsonObject(userinfo);
188
 		JSONObject json = JsonUtil.jsonStrToJsonObject(userinfo);
@@ -233,7 +212,7 @@ public class WxPmController extends ProjBaseAction {
233
 	 * @return
212
 	 * @return
234
 	 */
213
 	 */
235
 	@ApiOperation("获取我的中拍信息")
214
 	@ApiOperation("获取我的中拍信息")
236
-	@GetMapping(value = "/get_bidderinfo")
215
+	@RequestMapping(value = "/get_bidderinfo")
237
 	public String get_bidderinfo() {
216
 	public String get_bidderinfo() {
238
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
217
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
239
 		String persion_id = json.getString("kid");
218
 		String persion_id = json.getString("kid");
@@ -257,7 +236,7 @@ public class WxPmController extends ProjBaseAction {
257
 	 * @return
236
 	 * @return
258
 	 */
237
 	 */
259
 	@ApiOperation("去支付保证金")
238
 	@ApiOperation("去支付保证金")
260
-	@PostMapping("/apply")
239
+	@RequestMapping("/apply")
261
 	public String apply(String item_kid) {
240
 	public String apply(String item_kid) {
262
 
241
 
263
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
242
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -278,7 +257,7 @@ public class WxPmController extends ProjBaseAction {
278
 	 * @return
257
 	 * @return
279
 	 */
258
 	 */
280
 	@ApiOperation("去支付成交价")
259
 	@ApiOperation("去支付成交价")
281
-	@PostMapping("/payment")
260
+	@RequestMapping("/payment")
282
 	public String payment(String item_kid, String address_id, String message, BigDecimal red_pack_balance) {
261
 	public String payment(String item_kid, String address_id, String message, BigDecimal red_pack_balance) {
283
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
262
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
284
 		String persion_kid = persion.getString("kid");
263
 		String persion_kid = persion.getString("kid");
@@ -301,7 +280,7 @@ public class WxPmController extends ProjBaseAction {
301
 	 * @return
280
 	 * @return
302
 	 */
281
 	 */
303
 	@ApiOperation("查询全部已开拍和未开拍的")
282
 	@ApiOperation("查询全部已开拍和未开拍的")
304
-	@GetMapping("/list_item")
283
+	@RequestMapping("/list_item")
305
 	public String list_item() {
284
 	public String list_item() {
306
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.list_all_open());
285
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.list_all_open());
307
 		if (list.size() > 0) {
286
 		if (list.size() > 0) {
@@ -327,7 +306,7 @@ public class WxPmController extends ProjBaseAction {
327
 	 * @return
306
 	 * @return
328
 	 */
307
 	 */
329
 	@ApiOperation("增加围观人数")
308
 	@ApiOperation("增加围观人数")
330
-	@PostMapping("/add_circusee_num")
309
+	@RequestMapping("/add_circusee_num")
331
 	public String add_circusee_num(String kid) {
310
 	public String add_circusee_num(String kid) {
332
 		pmItemService.add_circusee_num(kid);// 增加围观次数
311
 		pmItemService.add_circusee_num(kid);// 增加围观次数
333
 		return result.toJSONString();
312
 		return result.toJSONString();
@@ -340,7 +319,7 @@ public class WxPmController extends ProjBaseAction {
340
 	 * @return
319
 	 * @return
341
 	 */
320
 	 */
342
 	@ApiOperation("详情页")
321
 	@ApiOperation("详情页")
343
-	@PostMapping("/select_list")
322
+	@RequestMapping("/select_list")
344
 	public String select_list(String kid) {
323
 	public String select_list(String kid) {
345
 		if (ChkUtil.isNull(kid)) {
324
 		if (ChkUtil.isNull(kid)) {
346
 			super.setTipMsg(false, "商品不存在", Tip.Type.error);
325
 			super.setTipMsg(false, "商品不存在", Tip.Type.error);
@@ -414,7 +393,7 @@ public class WxPmController extends ProjBaseAction {
414
 	 * @return
393
 	 * @return
415
 	 */
394
 	 */
416
 	@ApiOperation("竞价")
395
 	@ApiOperation("竞价")
417
-	@PostMapping("/compete_price")
396
+	@RequestMapping("/compete_price")
418
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
397
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
419
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
398
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
420
 		String pm_user_id = persion.getString("kid");
399
 		String pm_user_id = persion.getString("kid");
@@ -474,7 +453,7 @@ public class WxPmController extends ProjBaseAction {
474
 	 * @return
453
 	 * @return
475
 	 */
454
 	 */
476
 	@ApiOperation("待付款")
455
 	@ApiOperation("待付款")
477
-	@GetMapping("/wait_pay_money")
456
+	@RequestMapping("/wait_pay_money")
478
 	public String wait_pay_money() {
457
 	public String wait_pay_money() {
479
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
458
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
480
 		String persion_id = persion.getString("kid");
459
 		String persion_id = persion.getString("kid");
@@ -494,7 +473,7 @@ public class WxPmController extends ProjBaseAction {
494
 	 * @return
473
 	 * @return
495
 	 */
474
 	 */
496
 	@ApiOperation("待收货")
475
 	@ApiOperation("待收货")
497
-	@GetMapping("/wait_receive")
476
+	@RequestMapping("/wait_receive")
498
 	public String wait_receive() {
477
 	public String wait_receive() {
499
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
478
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
500
 		String persion_id = persion.getString("kid");
479
 		String persion_id = persion.getString("kid");
@@ -515,7 +494,7 @@ public class WxPmController extends ProjBaseAction {
515
 	 * @return
494
 	 * @return
516
 	 */
495
 	 */
517
 	@ApiOperation("修改地址")
496
 	@ApiOperation("修改地址")
518
-	@GetMapping("/update_address")
497
+	@RequestMapping("/update_address")
519
 	public String update_address() {
498
 	public String update_address() {
520
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
499
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
521
 		String persion_id = persion.getString("kid");
500
 		String persion_id = persion.getString("kid");
@@ -535,7 +514,7 @@ public class WxPmController extends ProjBaseAction {
535
 	 * @return
514
 	 * @return
536
 	 */
515
 	 */
537
 	@ApiOperation("确认收货")
516
 	@ApiOperation("确认收货")
538
-	@PostMapping("/verify_receive")
517
+	@RequestMapping("/verify_receive")
539
 	public String verify_receive(String item_kid) {
518
 	public String verify_receive(String item_kid) {
540
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
519
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
541
 		String persion_id = persion.getString("kid");
520
 		String persion_id = persion.getString("kid");
@@ -550,7 +529,7 @@ public class WxPmController extends ProjBaseAction {
550
 	 * @return
529
 	 * @return
551
 	 */
530
 	 */
552
 	@ApiOperation("获取我正在拍的")
531
 	@ApiOperation("获取我正在拍的")
553
-	@GetMapping("/get_bidding")
532
+	@RequestMapping("/get_bidding")
554
 	public String get_bidding() {
533
 	public String get_bidding() {
555
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
534
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
556
 		String persion_id = persion.getString("kid");
535
 		String persion_id = persion.getString("kid");
@@ -580,7 +559,7 @@ public class WxPmController extends ProjBaseAction {
580
 	 * @return
559
 	 * @return
581
 	 */
560
 	 */
582
 	@ApiOperation("等待发货的列表")
561
 	@ApiOperation("等待发货的列表")
583
-	@GetMapping("/wait_deliver")
562
+	@RequestMapping("/wait_deliver")
584
 	public String wait_deliver() {
563
 	public String wait_deliver() {
585
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
564
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
586
 		String persion_id = persion.getString("kid");
565
 		String persion_id = persion.getString("kid");
@@ -601,7 +580,7 @@ public class WxPmController extends ProjBaseAction {
601
 	 * @return
580
 	 * @return
602
 	 */
581
 	 */
603
 	@ApiOperation("物流详情")
582
 	@ApiOperation("物流详情")
604
-	@PostMapping("/logistics_detail")
583
+	@RequestMapping("/logistics_detail")
605
 	public String logistics_detail(String item_kid) {
584
 	public String logistics_detail(String item_kid) {
606
 
585
 
607
 		t_pm_item_submit pm_item_submit = pmItemService.logistics_detail(item_kid);
586
 		t_pm_item_submit pm_item_submit = pmItemService.logistics_detail(item_kid);
@@ -621,7 +600,7 @@ public class WxPmController extends ProjBaseAction {
621
 	 * @return
600
 	 * @return
622
 	 */
601
 	 */
623
 	@ApiOperation("买家查看的直播间列表")
602
 	@ApiOperation("买家查看的直播间列表")
624
-	@GetMapping("/list_live_item")
603
+	@RequestMapping("/list_live_item")
625
 	public String list_live_item() {
604
 	public String list_live_item() {
626
 		/*
605
 		/*
627
 		 * String url =
606
 		 * String url =
@@ -652,7 +631,7 @@ public class WxPmController extends ProjBaseAction {
652
 	 * @return
631
 	 * @return
653
 	 */
632
 	 */
654
 	@ApiOperation("进入直播间详情页面 返回直播间信息和直播间下的所有标的物信息、已开拍的标的物信息 买家报名信息,出价次数")
633
 	@ApiOperation("进入直播间详情页面 返回直播间信息和直播间下的所有标的物信息、已开拍的标的物信息 买家报名信息,出价次数")
655
-	@PostMapping("/live_item_detail")
634
+	@RequestMapping("/live_item_detail")
656
 	public String live_item_lsit(String live_room_id) {
635
 	public String live_item_lsit(String live_room_id) {
657
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.live_detail(live_room_id));
636
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.live_detail(live_room_id));
658
 
637
 
@@ -677,7 +656,7 @@ public class WxPmController extends ProjBaseAction {
677
 	 * @throws ClientProtocolException
656
 	 * @throws ClientProtocolException
678
 	 */
657
 	 */
679
 	@ApiOperation("发货")
658
 	@ApiOperation("发货")
680
-	@PostMapping("/deliver")
659
+	@RequestMapping("/deliver")
681
 	public String deliver(String item_kid, String type_code, long logistics_number, String expressage)
660
 	public String deliver(String item_kid, String type_code, long logistics_number, String expressage)
682
 			throws ClientProtocolException, IOException {
661
 			throws ClientProtocolException, IOException {
683
 		pmProjectItemService.deliver(item_kid, type_code, logistics_number, expressage);
662
 		pmProjectItemService.deliver(item_kid, type_code, logistics_number, expressage);
@@ -718,7 +697,7 @@ public class WxPmController extends ProjBaseAction {
718
 	 * @return
697
 	 * @return
719
 	 */
698
 	 */
720
 	@ApiOperation("查询所有快递")
699
 	@ApiOperation("查询所有快递")
721
-	@PostMapping("/list_express")
700
+	@RequestMapping("/list_express")
722
 	public String list_express(String pm_item_id) {
701
 	public String list_express(String pm_item_id) {
723
 		List<Map<String, Object>> list = wxPmService.list_express();
702
 		List<Map<String, Object>> list = wxPmService.list_express();
724
 		t_pm_item_submit pm_item_submit = wxPmService.get_address(pm_item_id);
703
 		t_pm_item_submit pm_item_submit = wxPmService.get_address(pm_item_id);
@@ -732,7 +711,7 @@ public class WxPmController extends ProjBaseAction {
732
 	 * 
711
 	 * 
733
 	 */
712
 	 */
734
 	@ApiOperation("准备付款 跳到订单页面")
713
 	@ApiOperation("准备付款 跳到订单页面")
735
-	@PostMapping("/prepare_payment")
714
+	@RequestMapping("/prepare_payment")
736
 	public String prepare_payment(String kid) {
715
 	public String prepare_payment(String kid) {
737
 
716
 
738
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
717
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -773,7 +752,7 @@ public class WxPmController extends ProjBaseAction {
773
 	 * @return
752
 	 * @return
774
 	 */
753
 	 */
775
 	@ApiOperation("获取标的物下的中拍人")
754
 	@ApiOperation("获取标的物下的中拍人")
776
-	@PostMapping("/get_bid_man")
755
+	@RequestMapping("/get_bid_man")
777
 	public String get_bid_man(String item_kid) {
756
 	public String get_bid_man(String item_kid) {
778
 
757
 
779
 		t_pm_item pm_item = wxPmService.get_bid_man(item_kid);
758
 		t_pm_item pm_item = wxPmService.get_bid_man(item_kid);
@@ -792,7 +771,7 @@ public class WxPmController extends ProjBaseAction {
792
 	 * @return
771
 	 * @return
793
 	 */
772
 	 */
794
 	@ApiOperation("保证金退还列表")
773
 	@ApiOperation("保证金退还列表")
795
-	@GetMapping("/list_refund")
774
+	@RequestMapping("/list_refund")
796
 	public String list_refund() {
775
 	public String list_refund() {
797
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
776
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
798
 		String persion_id = persion.getString("kid");
777
 		String persion_id = persion.getString("kid");
@@ -830,7 +809,7 @@ public class WxPmController extends ProjBaseAction {
830
 	 * @return
809
 	 * @return
831
 	 */
810
 	 */
832
 	@ApiOperation("发起退款")
811
 	@ApiOperation("发起退款")
833
-	@PostMapping("/initiate_refund")
812
+	@RequestMapping("/initiate_refund")
834
 	public String initiate_refund(String item_kid) {
813
 	public String initiate_refund(String item_kid) {
835
 
814
 
836
 		return result.toJSONString();
815
 		return result.toJSONString();
@@ -846,7 +825,7 @@ public class WxPmController extends ProjBaseAction {
846
 	 * @return
825
 	 * @return
847
 	 */
826
 	 */
848
 	@ApiOperation("查询拍品状态")
827
 	@ApiOperation("查询拍品状态")
849
-	@PostMapping("/check_item_status")
828
+	@RequestMapping("/check_item_status")
850
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
829
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
851
 		List<Map<String, Object>> l1 = pmItemService.select_submit_count(pm_item_id);
830
 		List<Map<String, Object>> l1 = pmItemService.select_submit_count(pm_item_id);
852
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
831
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
@@ -889,7 +868,7 @@ public class WxPmController extends ProjBaseAction {
889
 	 * @return
868
 	 * @return
890
 	 */
869
 	 */
891
 	@ApiOperation("查询直播拍品状态")
870
 	@ApiOperation("查询直播拍品状态")
892
-	@PostMapping("/check_live_item_status")
871
+	@RequestMapping("/check_live_item_status")
893
 	public String check_live_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
872
 	public String check_live_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
894
 
873
 
895
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
874
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
@@ -940,7 +919,7 @@ public class WxPmController extends ProjBaseAction {
940
 	 * @return
919
 	 * @return
941
 	 */
920
 	 */
942
 	@ApiOperation("提交意见")
921
 	@ApiOperation("提交意见")
943
-	@PostMapping("/add_feedback_message")
922
+	@RequestMapping("/add_feedback_message")
944
 	public String add_feedback_message(String feedback_message) {
923
 	public String add_feedback_message(String feedback_message) {
945
 		try {
924
 		try {
946
 			SensitiveWord sw = new SensitiveWord("src/main/java/CensorWords");
925
 			SensitiveWord sw = new SensitiveWord("src/main/java/CensorWords");
@@ -964,7 +943,7 @@ public class WxPmController extends ProjBaseAction {
964
 	 * @return
943
 	 * @return
965
 	 */
944
 	 */
966
 	@ApiOperation("根据分类查询拍品")
945
 	@ApiOperation("根据分类查询拍品")
967
-	@PostMapping("/select_item_by_chassify")
946
+	@RequestMapping("/select_item_by_chassify")
968
 	public String select_item_by_chassify(String bid_type, String bid_from) {
947
 	public String select_item_by_chassify(String bid_type, String bid_from) {
969
 		System.out.println("bid_type:" + bid_type);
948
 		System.out.println("bid_type:" + bid_type);
970
 		System.out.println("bid_from:" + bid_from);
949
 		System.out.println("bid_from:" + bid_from);
@@ -979,7 +958,7 @@ public class WxPmController extends ProjBaseAction {
979
 	 * @return
958
 	 * @return
980
 	 */
959
 	 */
981
 	@ApiOperation("轮播图")
960
 	@ApiOperation("轮播图")
982
-	@GetMapping("/list_slideshow")
961
+	@RequestMapping("/list_slideshow")
983
 	public String list_slideshow() {
962
 	public String list_slideshow() {
984
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
963
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
985
 		result.put("data", list);
964
 		result.put("data", list);
@@ -994,7 +973,7 @@ public class WxPmController extends ProjBaseAction {
994
 	 * @return
973
 	 * @return
995
 	 */
974
 	 */
996
 	@ApiOperation("设置收藏")
975
 	@ApiOperation("设置收藏")
997
-	@PostMapping("/add_collect")
976
+	@RequestMapping("/add_collect")
998
 	public String add_collect(String pm_item_id, String form_id) {
977
 	public String add_collect(String pm_item_id, String form_id) {
999
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
978
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
1000
 		String pm_user_id = persion.getString("kid");
979
 		String pm_user_id = persion.getString("kid");
@@ -1014,7 +993,7 @@ public class WxPmController extends ProjBaseAction {
1014
 	 * 
993
 	 * 
1015
 	 * @return
994
 	 * @return
1016
 	 */
995
 	 */
1017
-	@GetMapping("/select_pay_record_by_persion")
996
+	@RequestMapping("/select_pay_record_by_persion")
1018
 	public String get_pay_record() {
997
 	public String get_pay_record() {
1019
 		// JSONObject persion = sessionWxService.getCurrentLoginPersion();
998
 		// JSONObject persion = sessionWxService.getCurrentLoginPersion();
1020
 		// String pm_user_id = persion.getString("kid");
999
 		// String pm_user_id = persion.getString("kid");
@@ -1027,7 +1006,7 @@ public class WxPmController extends ProjBaseAction {
1027
 	 * @return
1006
 	 * @return
1028
 	 */
1007
 	 */
1029
 	@ApiOperation("查询消息数量")
1008
 	@ApiOperation("查询消息数量")
1030
-	@GetMapping("/select_count")
1009
+	@RequestMapping("/select_count")
1031
 	public String select_count() {
1010
 	public String select_count() {
1032
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
1011
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
1033
 		String persion_id = persion.getString("kid");
1012
 		String persion_id = persion.getString("kid");
@@ -1046,7 +1025,7 @@ public class WxPmController extends ProjBaseAction {
1046
 	 * @return
1025
 	 * @return
1047
 	 */
1026
 	 */
1048
 	@ApiOperation("查询中拍记录")
1027
 	@ApiOperation("查询中拍记录")
1049
-	@GetMapping("/select_bidding_record")
1028
+	@RequestMapping("/select_bidding_record")
1050
 	public String select_bidding_record() {
1029
 	public String select_bidding_record() {
1051
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
1030
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
1052
 		String pm_user_id = persion.getString("kid");
1031
 		String pm_user_id = persion.getString("kid");

+ 13 - 16
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxRedPackController.java

@@ -1,18 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.math.BigDecimal;
4
-import java.util.List;
5
-import java.util.Map;
6
-
7
-import io.swagger.annotations.Api;
8
-import org.springframework.beans.factory.annotation.Autowired;
9
-import org.springframework.context.annotation.Scope;
10
-import org.springframework.web.bind.annotation.GetMapping;
11
-import org.springframework.web.bind.annotation.PostMapping;
12
-import org.springframework.web.bind.annotation.RequestMapping;
13
-import org.springframework.web.bind.annotation.RestController;
14
-import org.tmsps.ne4spring.utils.DateTools;
15
-
16
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
17
 import com.ydw.yunbuyer.api.user.api.PersionApi;
4
 import com.ydw.yunbuyer.api.user.api.PersionApi;
18
 import com.ydw.yunbuyer.api.user.api.RedPackApi;
5
 import com.ydw.yunbuyer.api.user.api.RedPackApi;
@@ -21,6 +8,16 @@ import com.ydw.yunbuyer.api.user.entity.RedPack;
21
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
8
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
22
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
9
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
23
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
10
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
11
+import io.swagger.annotations.Api;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.context.annotation.Scope;
14
+import org.springframework.web.bind.annotation.RequestMapping;
15
+import org.springframework.web.bind.annotation.RestController;
16
+import org.tmsps.ne4spring.utils.DateTools;
17
+
18
+import java.math.BigDecimal;
19
+import java.util.List;
20
+import java.util.Map;
24
 
21
 
25
 /**
22
 /**
26
  * 红包
23
  * 红包
@@ -46,7 +43,7 @@ public class WxRedPackController extends ProjBaseAction {
46
 	@Autowired
43
 	@Autowired
47
 	private SessionWxService sessionWxService;
44
 	private SessionWxService sessionWxService;
48
 
45
 
49
-	@GetMapping(value = "/get_balance")
46
+	@RequestMapping(value = "/get_balance")
50
 	public String get_balance() {
47
 	public String get_balance() {
51
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
48
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
52
 		String persion_id = json1.getString("kid");
49
 		String persion_id = json1.getString("kid");
@@ -55,7 +52,7 @@ public class WxRedPackController extends ProjBaseAction {
55
 		return result.toJSONString();
52
 		return result.toJSONString();
56
 	}
53
 	}
57
 
54
 
58
-	@GetMapping(value = "/list_redpack")
55
+	@RequestMapping(value = "/list_redpack")
59
 	public String list_redback() {
56
 	public String list_redback() {
60
 
57
 
61
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
58
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
@@ -77,7 +74,7 @@ public class WxRedPackController extends ProjBaseAction {
77
 		return result.toJSONString();
74
 		return result.toJSONString();
78
 	}
75
 	}
79
 
76
 
80
-	@PostMapping(value = "/add_redpack")
77
+	@RequestMapping(value = "/add_redpack")
81
 	public String add_redback(String persion_id) {
78
 	public String add_redback(String persion_id) {
82
 		RedPack red_pack = new RedPack();
79
 		RedPack red_pack = new RedPack();
83
 		red_pack.setBalance(new BigDecimal(1));
80
 		red_pack.setBalance(new BigDecimal(1));

+ 12 - 14
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxShopController.java

@@ -1,16 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.util.List;
4
-import java.util.Map;
5
-
6
-import io.swagger.annotations.Api;
7
-import org.springframework.beans.factory.annotation.Autowired;
8
-import org.springframework.context.annotation.Scope;
9
-import org.springframework.web.bind.annotation.GetMapping;
10
-import org.springframework.web.bind.annotation.PostMapping;
11
-import org.springframework.web.bind.annotation.RequestMapping;
12
-import org.springframework.web.bind.annotation.RestController;
13
-import org.tmsps.ne4spring.utils.ChkUtil;
14
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
15
 import com.ydw.yunbuyer.api.user.api.PersionApi;
4
 import com.ydw.yunbuyer.api.user.api.PersionApi;
16
 import com.ydw.yunbuyer.api.user.entity.Persion;
5
 import com.ydw.yunbuyer.api.user.entity.Persion;
@@ -20,6 +9,15 @@ import com.ydw.yunbuyer.web.pm.entity.t_shop;
20
 import com.ydw.yunbuyer.web.pm.service.ShopService;
9
 import com.ydw.yunbuyer.web.pm.service.ShopService;
21
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
10
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
22
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
11
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
12
+import io.swagger.annotations.Api;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.context.annotation.Scope;
15
+import org.springframework.web.bind.annotation.RequestMapping;
16
+import org.springframework.web.bind.annotation.RestController;
17
+import org.tmsps.ne4spring.utils.ChkUtil;
18
+
19
+import java.util.List;
20
+import java.util.Map;
23
 
21
 
24
 /**
22
 /**
25
  * 店铺
23
  * 店铺
@@ -45,14 +43,14 @@ public class WxShopController extends ProjBaseAction {
45
 	@Autowired
43
 	@Autowired
46
 	private WxPmService wxPmService;
44
 	private WxPmService wxPmService;
47
 
45
 
48
-	@GetMapping("list_bank")
46
+	@RequestMapping("list_bank")
49
 	public String list_bank() {
47
 	public String list_bank() {
50
 		List<Map<String, Object>> list = wxPmService.list_bank();
48
 		List<Map<String, Object>> list = wxPmService.list_bank();
51
 		result.put("data", list);
49
 		result.put("data", list);
52
 		return result.toJSONString();
50
 		return result.toJSONString();
53
 	}
51
 	}
54
 
52
 
55
-	@GetMapping(value = "/get_shop_info")
53
+	@RequestMapping(value = "/get_shop_info")
56
 	public String get_shop_info() {
54
 	public String get_shop_info() {
57
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
55
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
58
 		String persion_id = json.getString("kid");
56
 		String persion_id = json.getString("kid");
@@ -74,7 +72,7 @@ public class WxShopController extends ProjBaseAction {
74
 		return result.toJSONString();
72
 		return result.toJSONString();
75
 	}
73
 	}
76
 
74
 
77
-	@PostMapping(value = "/new_register_shop")
75
+	@RequestMapping(value = "/new_register_shop")
78
 	public String new_register_shop(t_shop shop) {
76
 	public String new_register_shop(t_shop shop) {
79
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
77
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
80
 		String persion_id = json.getString("kid");
78
 		String persion_id = json.getString("kid");

+ 6 - 11
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxSubmitController.java

@@ -1,21 +1,16 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import io.swagger.annotations.Api;
4
-import org.springframework.beans.factory.annotation.Autowired;
5
-import org.springframework.context.annotation.Scope;
6
-import org.springframework.util.StringUtils;
7
-import org.springframework.web.bind.annotation.PostMapping;
8
-import org.springframework.web.bind.annotation.RequestMapping;
9
-import org.springframework.web.bind.annotation.RestController;
10
-
11
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
12
-import com.ydw.yunbuyer.api.user.api.PersionApi;
13
-import com.ydw.yunbuyer.api.user.entity.Persion;
14
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
4
 import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
15
 import com.ydw.yunbuyer.web.pm.base.Tip;
5
 import com.ydw.yunbuyer.web.pm.base.Tip;
16
 import com.ydw.yunbuyer.web.pm.entity.t_pm_offline_apply;
6
 import com.ydw.yunbuyer.web.pm.entity.t_pm_offline_apply;
17
 import com.ydw.yunbuyer.web.pm.service.WxSubmitService;
7
 import com.ydw.yunbuyer.web.pm.service.WxSubmitService;
18
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
8
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
9
+import io.swagger.annotations.Api;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.context.annotation.Scope;
12
+import org.springframework.web.bind.annotation.RequestMapping;
13
+import org.springframework.web.bind.annotation.RestController;
19
 
14
 
20
 /**
15
 /**
21
  * 店铺
16
  * 店铺
@@ -35,7 +30,7 @@ public class WxSubmitController extends ProjBaseAction {
35
 	@Autowired
30
 	@Autowired
36
 	private WxSubmitService wxSubmitService;
31
 	private WxSubmitService wxSubmitService;
37
 
32
 
38
-	@PostMapping(value = "/offline_apply")
33
+	@RequestMapping(value = "/offline_apply")
39
 	public String offline_apply(t_pm_offline_apply pm_offline_apply) {
34
 	public String offline_apply(t_pm_offline_apply pm_offline_apply) {
40
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
35
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
41
 		String persion_id = json.getString("kid");
36
 		String persion_id = json.getString("kid");

+ 10 - 12
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxchatController.java

@@ -1,15 +1,5 @@
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
1
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
2
 
2
 
3
-import java.util.List;
4
-import java.util.Map;
5
-
6
-import io.swagger.annotations.Api;
7
-import org.springframework.beans.factory.annotation.Autowired;
8
-import org.springframework.context.annotation.Scope;
9
-import org.springframework.web.bind.annotation.PostMapping;
10
-import org.springframework.web.bind.annotation.RequestMapping;
11
-import org.springframework.web.bind.annotation.RestController;
12
-
13
 import com.alibaba.fastjson.JSONObject;
3
 import com.alibaba.fastjson.JSONObject;
14
 import com.ydw.yunbuyer.api.user.api.PersionApi;
4
 import com.ydw.yunbuyer.api.user.api.PersionApi;
15
 import com.ydw.yunbuyer.api.user.entity.Persion;
5
 import com.ydw.yunbuyer.api.user.entity.Persion;
@@ -17,6 +7,14 @@ import com.ydw.yunbuyer.web.pm.base.ProjBaseAction;
17
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
7
 import com.ydw.yunbuyer.web.pm.service.PmItemService;
18
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
8
 import com.ydw.yunbuyer.web.pm.service.WxPmService;
19
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
9
 import com.ydw.yunbuyer.web.pm.web.SessionWxService;
10
+import io.swagger.annotations.Api;
11
+import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.context.annotation.Scope;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RestController;
15
+
16
+import java.util.List;
17
+import java.util.Map;
20
 
18
 
21
 /**
19
 /**
22
  * 直播间聊天信息
20
  * 直播间聊天信息
@@ -42,7 +40,7 @@ public class WxchatController extends ProjBaseAction {
42
 	@Autowired
40
 	@Autowired
43
 	private PersionApi persionApi;
41
 	private PersionApi persionApi;
44
 
42
 
45
-	@PostMapping("/get_chatting_records")
43
+	@RequestMapping("/get_chatting_records")
46
 	public String get_chatting_records(String live_room_id, long chat_time) {
44
 	public String get_chatting_records(String live_room_id, long chat_time) {
47
 		List<Map<String, Object>> list = pmItemService.get_chatting_records(live_room_id, chat_time);
45
 		List<Map<String, Object>> list = pmItemService.get_chatting_records(live_room_id, chat_time);
48
 		for (Map<String, Object> map : list) {
46
 		for (Map<String, Object> map : list) {
@@ -55,7 +53,7 @@ public class WxchatController extends ProjBaseAction {
55
 		return result.toJSONString();
53
 		return result.toJSONString();
56
 	}
54
 	}
57
 
55
 
58
-	@PostMapping("/add_chitchat")
56
+	@RequestMapping("/add_chitchat")
59
 	public String add_chitchat(String content, String liveroom_id) {
57
 	public String add_chitchat(String content, String liveroom_id) {
60
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
58
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
61
 		String persion_id = json.getString("kid");
59
 		String persion_id = json.getString("kid");