Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -29,7 +29,7 @@ public interface IUserService {
     AppUserInfo AppValidate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 
     @RequestMapping(value = "/api/app/user/sendsms", method = RequestMethod.POST)
-    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList);
+    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList", defaultValue = "")String pointList);
     @RequestMapping(value = "/api/app/user/register", method = RequestMethod.POST)
     public JSONObject register(   @RequestParam(value="username",defaultValue="")String  username,
                                   @RequestParam(value="mobilecode",defaultValue="")String mobilecode,

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -111,7 +111,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
 
     public void  save(AppUserAlipay appUserAlipay) {
         Example example=new Example(AppUserAlipay.class);
-        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0);
+        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0).andEqualTo("txAlipay", appUserAlipay.getTxAlipay());
         example.setOrderByClause("is_default desc");
         AppUserAlipay oldValue = mapper.selectOneByExample(example);
         if (oldValue != null) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -105,8 +105,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
-            insertSelective(userPositionTemp);
+            userPositionTemp.setIsQuit(0);
+            int ids = addUserFindId(userPositionTemp).getId();
+            appUserPositionTempDTO.setId(ids);
             //记录表插入
+            //  appUserPositionTempDTO.setId();
             appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         } else {
             updateSelectiveById(userPositionTemp);
@@ -194,7 +197,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public Map<String, Object> importUserPostion(List<String[]> userPostionData,Integer operatorId) {
+    public Map<String, Object> importUserPostion(List<String[]> userPostionData, Integer operatorId) {
         Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
@@ -275,13 +278,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     appUserPositionTemp.setId(id);
                     updateSelectiveById(appUserPositionTemp);
                 } else {
-                  //  insertSelective(appUserPositionTemp);
+                    //  insertSelective(appUserPositionTemp);
                     AppUserPositionTemp appUserPositionTempNew = new AppUserPositionTemp();
                     BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempNew);
                     appUserPositionTempNew = addUserFindId(appUserPositionTemp);
                     //记录表插入
                     appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempNew, operatorId);
                 }
+
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
@@ -439,12 +443,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 }
                 //身份变更
                 if (StaffChangeStatusEnum.IDENTITY_CHANE.getCode() == changeStatus) {
-                      //不是离职状态下
-                      if(Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit()!=1){
-                          postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
-                          //更改为股东身份
-                          loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
-                      }
+                    //不是离职状态下
+                    if (Objects.nonNull(userPositionTemp.getIsQuit()) && userPositionTemp.getIsQuit() != 1) {
+                        postionId = Objects.nonNull(postionId) ? postionId : appUserPositionTempDTO.getPositionId();
+                        //更改为股东身份
+                        loginBiz.updateUserPosition(appUserDetail.getUserid(), postionId);
+                    }
                 }
             }
         }

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

@@ -51,12 +51,8 @@ public class AppShareholderDetailController {
                 return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
             }
 //            appShareholderData.remove(0);
-            try {
-                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData, operatorId);
-                return ObjectRestResponse.succ(effectSize);
-            } catch (BaseException ex) {
-                return ObjectRestResponse.createDefaultFail();
-            }
+            return ObjectRestResponse.succ(appShareholderDetailBiz.importShareholder(appShareholderData, operatorId))
+                    ;
         } catch (Exception e) {
             throw new BaseException(e);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -71,7 +71,7 @@ public class AppUserRest {
      */
     @RequestMapping(value = "/user/sendsms", method = RequestMethod.POST)
     public @ResponseBody
-    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList")String pointList){
+    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList){
         return appPermissionService.sendSMS(username,type, pointList);
     }