|
|
@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.customers.web;
|
|
|
|
|
|
|
|
|
|
|
|
import au.com.royalpay.payment.manage.customers.core.EncourageService;
|
|
|
|
import au.com.royalpay.payment.manage.customers.core.EncourageService;
|
|
|
|
import au.com.royalpay.payment.tools.CommonConsts;
|
|
|
|
import au.com.royalpay.payment.tools.CommonConsts;
|
|
|
|
import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
|
|
|
|
|
|
@ -29,7 +28,7 @@ public class EncourageMoneyController {
|
|
|
|
private EncourageService encourageService;
|
|
|
|
private EncourageService encourageService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT)
|
|
|
|
@RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
|
|
|
|
public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
|
|
|
|
public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
|
|
|
|
@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
String user_id = "";
|
|
|
|
String user_id = "";
|
|
|
@ -50,7 +49,7 @@ public class EncourageMoneyController {
|
|
|
|
return encourageService.doubleEncourageMoney(orderId);
|
|
|
|
return encourageService.doubleEncourageMoney(orderId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@WechatMapping(value = "/my", method = RequestMethod.GET)
|
|
|
|
@RequestMapping(value = "/my", method = RequestMethod.GET)
|
|
|
|
public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
ModelAndView mav = new ModelAndView("activity/encourage_money/my");
|
|
|
|
ModelAndView mav = new ModelAndView("activity/encourage_money/my");
|
|
|
|
JSONObject user = new JSONObject();
|
|
|
|
JSONObject user = new JSONObject();
|
|
|
|