|
|
@ -27,12 +27,13 @@ public class EncourageMoneyController {
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
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,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
public JSONObject takeEncourageMoney(@PathVariable String orderId,@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
|
|
|
|
String user_id = "";
|
|
|
|
String user_id = "";
|
|
|
|
if(wxUser==null){
|
|
|
|
if(wxUser==null){
|
|
|
|
user_id = aliuser.getString("user_id");
|
|
|
|
user_id = aliuser.getString("user_id");
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
|
|
|
|
logger.info("====wxUser=="+wxUser.toJSONString());
|
|
|
|
user_id = wxUser.getString("openid");
|
|
|
|
user_id = wxUser.getString("openid");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(StringUtils.isEmpty(user_id)){
|
|
|
|
if(StringUtils.isEmpty(user_id)){
|
|
|
|