Merge branch 'hotfix' into develop

master
kira 6 years ago
commit bd63e07eb5

@ -32,10 +32,10 @@ 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);
if (wxUser == null) {
user_id = aliuser.getString("user_id");
} else {
logger.info("====wxUser==" + wxUser.toJSONString());
user_id = wxUser.getString("openid");
}
if (StringUtils.isEmpty(user_id)) {

Loading…
Cancel
Save