|
@@ -33,13 +33,27 @@ public class PromotionController {
|
|
*/
|
|
*/
|
|
@PostMapping("page")
|
|
@PostMapping("page")
|
|
private R page(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
|
|
private R page(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
|
|
- //获取token
|
|
|
|
- String token = headers.get("token");
|
|
|
|
- String providerId = headers.get("provider_id");
|
|
|
|
- Integer mercId = MercAuthUtils.getMercId(token, providerId);
|
|
|
|
|
|
+ Integer mercId = MercAuthUtils.getMercId(headers);
|
|
JMap<String, Object> jParam = new JHashMap<>(param);
|
|
JMap<String, Object> jParam = new JHashMap<>(param);
|
|
jParam.put("mercId", mercId);
|
|
jParam.put("mercId", mercId);
|
|
Page<Map<String, Object>> data = promotionService.page(jParam);
|
|
Page<Map<String, Object>> data = promotionService.page(jParam);
|
|
return R.ok(data);
|
|
return R.ok(data);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @PostMapping("saveOrUpdate")
|
|
|
|
+ private R saveOrUpdate(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
|
|
|
|
+ Integer mercId = MercAuthUtils.getMercId(headers);
|
|
|
|
+ JMap<String, Object> jParam = new JHashMap<>(param);
|
|
|
|
+ jParam.put("mercId", mercId);
|
|
|
|
+ return R.ok(promotionService.saveOrUpdate(jParam));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @PostMapping("updateSimple")
|
|
|
|
+ private R updateSimple(@RequestBody Map<String, Object> param, @RequestHeader Map<String, String> headers) {
|
|
|
|
+ Integer mercId = MercAuthUtils.getMercId(headers);
|
|
|
|
+ JMap<String, Object> jParam = new JHashMap<>(param);
|
|
|
|
+ jParam.put("mercId", mercId);
|
|
|
|
+ promotionService.updateSimple(jParam);
|
|
|
|
+ return R.ok();
|
|
|
|
+ }
|
|
}
|
|
}
|