Merge remote-tracking branch 'origin/master'

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -19,11 +19,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -71,6 +71,9 @@ public class AppUserController extends CommonBaseController{
     @Autowired
     private OrderFeign orderFeign;
 
+    @Autowired
+    private AppUserAlipayBiz appUserAlipayBiz;
+
 
 
     @GetMapping("page")
@@ -202,10 +205,9 @@ public class AppUserController extends CommonBaseController{
      * @throws Exception
      */
     @PostMapping("/edit")
-    public ObjectRestResponse edit(@RequestBody AppUserVo userVo)throws Exception {
-        if(userVo==null||userVo.getId()==null){
-            return   ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
-        }
+    public ObjectRestResponse edit(@RequestBody AppUserVo userVo,HttpServletRequest request)throws Exception {
+        String id = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
+        userVo.setUserid(Integer.valueOf(id));
         userDetailBiz.updUuserInfoById(userVo);
         Integer userid=userVo.getUserid();
         if (userid!=null){
@@ -215,8 +217,13 @@ public class AppUserController extends CommonBaseController{
             appUserLogin.setOpenid(userVo.getOpenid());
             appUserLogin.setId(userid);
             appUserLogin.setUsername(userVo.getUsername());
-            appUserLoginBiz.bindOpenid(appUserLogin);
+            appUserLoginBiz.updateAppuserLogin(appUserLogin);
+            //支付宝绑定
+            if (StringUtils.isNotEmpty(userVo.getAliCode()) && userVo.getAliCode().trim().length()>0){
+               appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
+            }
         }
+
         return ObjectRestResponse.succ();
     }