master
kira 6 years ago
parent 001ea48494
commit a51df7da06

@ -32,7 +32,7 @@ public class EncourageMoneyController {
public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
String user_id = "";
logger.info("problem order id:"+orderId);
logger.info("problem order id:"+orderId+"--wxUser:"+wxUser+"--aliuser:"+aliuser);
if (wxUser == null) {
user_id = aliuser.getString("user_id");
} else {
@ -81,4 +81,13 @@ public class EncourageMoneyController {
public ModelAndView merchantsPage() {
return new ModelAndView("activity/encourage_money/merchants");
}
public static void main(String[] args) {
JSONObject asd = null;
JSONObject qwe = null;
System.out.println(asd);
System.out.println(qwe);
}
}

Loading…
Cancel
Save