Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,7 +2,6 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.dto.StaffStatisticsFindDTO;
@@ -16,6 +15,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -36,6 +36,10 @@ import java.util.stream.Collectors;
 @Transactional(rollbackFor = Exception.class)
 public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
+
+
+
+
     @Override
     @CacheClear(pre = "user{1.userid}")
     public void updateSelectiveById(AppUserDetail entity) {
@@ -208,8 +212,6 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return mapper.getUser(userId);
     }
 
-    public List<UserBo> findUserBosByPhones(List<String> phones) {
-         List<UserBo> userBoList = mapper.findUserBosByPhones(phones);
-        return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
-    }
+
+
 }

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -66,6 +67,9 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     @Autowired
     private AppUserSellingWaterBiz appUserSellingWaterBiz;
 
+    @Autowired
+    private AppUserPositionTempBiz appUserPositionTempBiz;
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -252,7 +256,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public Map<String, Integer> findPhoneAndUserIdMapByPhonesForDel(List<String> phones) {
         Example example = new Example(AppUserLogin.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("username",phones);
+        criteria.andIn("username", phones);
         List<AppUserLogin> appUserLogins = mapper.selectByExample(example);
         Map<String, Integer> phoneAndUserIdMap = null;
         if (CollectionUtils.isNotEmpty(appUserLogins)) {
@@ -345,8 +349,8 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
-       
-        return mapper.getUserByUsernameAndRealName(username,realName);
+
+        return mapper.getUserByUsernameAndRealName(username, realName);
 
     }
 
@@ -421,7 +425,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     public List<Integer> findAppuser(String phone, String leaderPhone, String name) {
         List<Integer> memberIds = null;
         //1.根据leader手机号查询userid
-         boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length()>0;
+        boolean isNoNullLeaderPhone = StringUtils.isNotEmpty(leaderPhone) && leaderPhone.trim().length() > 0;
         if (isNoNullLeaderPhone) {
             List<AppUserLogin> appUserLogins = mapper.selectbyPhones(Arrays.asList(leaderPhone));
             Integer leaderId = null;
@@ -429,34 +433,34 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
                 return Collections.EMPTY_LIST;
             }
             leaderId = appUserLogins.get(0).getId();
-        //2.根据leader userId查询下级 userid
-        if (Objects.nonNull(leaderId)) {
-              memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId,3);
-            if(CollectionUtils.isEmpty(memberIds)){
-                return Collections.EMPTY_LIST;
+            //2.根据leader userId查询下级 userid
+            if (Objects.nonNull(leaderId)) {
+                memberIds = appUserSellingWaterBiz.findMemberIdByLeaderIdAndOrdreType(leaderId, 3);
+                if (CollectionUtils.isEmpty(memberIds)) {
+                    return Collections.EMPTY_LIST;
+                }
             }
         }
-        }
         List<Integer> userIds = mapper.findAppUser(phone, name, memberIds);
-        return  userIds==null?Collections.EMPTY_LIST:userIds;
+        return userIds == null ? Collections.EMPTY_LIST : userIds;
     }
 
     public List<UserBo> findUserDetailInfo(List<UserBo> userBos) {
-        Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x->Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId));
+        Map<String, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x -> Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getOrderNo, UserBo::getFacilitateId));
         List<Integer> userIdList = userBos.stream().map(UserBo::getUserId).distinct().collect(Collectors.toList());
 
         //查询上级人
         List<AppUserRelation> appUserRelationList = appUserRelationBiz.findLeaderByUserIds(userIdList);
         Map<Integer, Integer> memberIdAndParentMap = appUserRelationList.stream().collect(Collectors.toMap(AppUserRelation::getUserId, AppUserRelation::getParentId));
 
-        List<Integer>  uids = new ArrayList<>();
-        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdList);
-        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdAndFacilitateIdMap.values());
-        uids.addAll(memberIdAndParentMap==null?Collections.EMPTY_LIST:memberIdAndParentMap.values());
+        List<Integer> uids = new ArrayList<>();
+        uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdList);
+        uids.addAll(userIdAndFacilitateIdMap == null ? Collections.EMPTY_LIST : userIdAndFacilitateIdMap.values());
+        uids.addAll(memberIdAndParentMap == null ? Collections.EMPTY_LIST : memberIdAndParentMap.values());
 
         List<UserBo> userBoList = mapper.selectByUserIds(uids);
-        Map<Integer, UserBo> userMap = userBoList==null?Collections.EMPTY_MAP:userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
-        if (userMap.isEmpty()){
+        Map<Integer, UserBo> userMap = userBoList == null ? Collections.EMPTY_MAP : userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
+        if (userMap.isEmpty()) {
             return Collections.EMPTY_LIST;
         }
 
@@ -479,4 +483,22 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return userBos;
     }
+
+
+    @CacheClear(pre = "user{1}")
+    public void updateUserPosition(Integer userId, Integer positionId, Integer operatorId) {
+        AppUserLogin appUserLogin = selectById(userId);
+        if (appUserLogin != null) {
+            String phone = appUserLogin.getUsername();
+            appUserPositionTempBiz.findUserPositionTemp(phone, positionId, operatorId);
+        }
+        appUserDetailBiz.updateUserPositionByUserId(userId, positionId);
+    }
+
+    @CacheClear(pre = "user{1}")
+    public void updateUserPosition(Integer userId, Integer positionId) {
+        appUserDetailBiz.updateUserPositionByUserId(userId, positionId);
+    }
+
+
 }

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionChangeRecordMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.select.Evaluator;
 import org.springframework.beans.BeanUtils;
@@ -39,7 +40,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public static final int POSITION_CHANGE = 3;
     public static final int COMPANY_CHANGE = 4;
     public static final int USER_LEAVE_COMPANT = 5;
-    public static final int USER_AND_ADD_COMPANY=6;
+    public static final int USER_AND_ADD_COMPANY = 6;
 
     /**
      * 变更记录表插入
@@ -103,12 +104,16 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
 
     /**
      * 员工复职
+     *
      * @param userPositionTemp
      * @param updUserId
      */
     public void andAddJoinJobRecord(AppUserPositionTempDTO userPositionTemp, Integer updUserId) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
         appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        if (userPositionTemp.getPositionId() != null) {
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+        }
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setRelTime(userPositionTemp.getRelTime());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
@@ -117,9 +122,24 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         mapper.insert(appUserPositionChangeRecord);
     }
 
-
-
-
+    /**
+     * APP用户修改身份
+     *
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void andAddJoinJobRecord(AppUserPositionTemp userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        if (userPositionTemp.getPositionId() != null) {
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+        }
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_AND_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
 
 
     /**

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

@@ -3,10 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
-import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.AppUserPositionTempMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -15,8 +12,10 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.im.utils.BeanUtil;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -66,6 +66,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserJobLevelBiz jobLevelBiz;
 
+    @Autowired
+    AppUserDetailBiz appUserDetailBiz;
+
     @Autowired
     AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
@@ -140,6 +143,9 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
             criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
         }
+        if (Objects.nonNull(appUserPositionTempFindDTO.getPositionId())) {
+            criteria.andEqualTo("positionId", appUserPositionTempFindDTO.getPositionId());
+        }
         if (Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
                 criteria.andNotEqualTo("userId", 0);
@@ -297,6 +303,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return result;
     }
 
+
+
     private enum DataStatus {
         USERED(1), NO_USERED(0);
         private int code;
@@ -374,7 +382,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return mapper.getUserIdByParentCompany(parentCompanyId);
     }
 
-
     /**
      * 员工信息修改，插入变更记录表
      * zuoyh
@@ -416,8 +423,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         } else {
             userPositionTemp.setUpdTime(nowTime);
             updateSelectiveById(userPositionTemp);
+            appUserPositionTempDTO.setPositionId(6);
             appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
         }
+        //用户表更改其身份
+        AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone());
+        if (userLogin != null) {
+            loginBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId());
+        }
         return ObjectRestResponse.succ();
     }
 
@@ -433,6 +446,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         updateSelectiveById(userPositionTemp);
         userPositionTemp.setUpdTime(System.currentTimeMillis());
         appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
+        //用户表更改其身份
+        AppUserLogin userLogin = loginBiz.checkeUserLogin(userPositionTemp.getPhone());
+        if (userLogin != null) {
+            AppUserDetail appUserDetail = new AppUserDetail();
+            loginBiz.updateUserPosition(userLogin.getId(), appUserPositionTempDTO.getPositionId(), operatorId);
+        }
         return ObjectRestResponse.succ();
     }
 
@@ -445,4 +464,26 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return appUserPositionChangeRecordBiz.findPositionChangeRecord(userPositionTemp);
     }
 
+    /**
+     * zuoyh
+     * app用户表修改职位，员工记录表对应查询
+     */
+    public void findUserPositionTemp(String phone, Integer positionId, Integer operatorId) {
+        Timestamp relTime = new Timestamp(System.currentTimeMillis());
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("phone", phone);
+        List<AppUserPositionTemp> list = mapper.selectByExample(example);
+        AppUserPositionTemp newAppUserPositionTemp = new AppUserPositionTemp();
+        if (list.size()>0) {
+            newAppUserPositionTemp =list.get(0);
+            if (newAppUserPositionTemp != null) {
+                AppUserPositionTemp odlAppUserPositionTemp = new AppUserPositionTemp();
+                BeanUtils.copyProperties(newAppUserPositionTemp, odlAppUserPositionTemp);
+                newAppUserPositionTemp.setPositionId(positionId);
+                newAppUserPositionTemp.setUpdTime(System.currentTimeMillis());
+                mapper.updateByPrimaryKey(newAppUserPositionTemp);
+                appUserPositionChangeRecordBiz.addPositionChangeRecord(newAppUserPositionTemp, odlAppUserPositionTemp, operatorId, relTime);
+            }
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionMapper.java

@@ -17,4 +17,5 @@ public interface AppUserPositionMapper extends Mapper<AppUserPosition>, IdListMa
 
     AppUserPosition getExtractByUserId(@Param("userId")Integer userId);
 
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionTempMapper.java

@@ -22,5 +22,7 @@ public interface AppUserPositionTempMapper extends Mapper<AppUserPositionTemp> {
     @Insert("INSERT IGNORE INTO `app_user_position_temp`(`user_id`,`phone`,`name`,`position_id`,`crt_time`)VALUES(#{userId},#{phone},#{name},#{positionId},#{crtTime})")
     void insertWithIgnoreRepeat(AppUserPositionTemp appUserPositionTemp);
 
+
+
     List<Integer> getUserIdByParentCompany(@Param("parentCompanyId") List<Integer> parentCompanyId);
 }

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

@@ -12,22 +12,28 @@ import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Set;
 
 /**
  * app用户管理类
+ *
  * @author Administrator
  */
+@Slf4j
 @RestController
 @RequestMapping("appUsersManage")
-public class AppUsersManageController extends BaseController<AppUserManageBiz,AppUserManage> {
+public class AppUsersManageController extends BaseController<AppUserManageBiz, AppUserManage> {
 
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
@@ -44,66 +50,76 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     @Autowired
     private VehicleFeign vehicleFeign;
 
-    private Integer ALL_PERMISSIONS=1;
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    private Integer ALL_PERMISSIONS = 1;
+
     /**
-     * 查询所有,获取详细信息
+     * 查询所有
+     *
      * @return
      */
     @PostMapping("/findAll")
     public ObjectRestResponse<PageInfo<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
         String token = userAuthConfig.getToken(request);
         ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
-        User  user  = (User) objectRestResponse.getData();
-        if (user==null){
+        User user = (User) objectRestResponse.getData();
+        if (user == null) {
             throw new BaseException("User error!");
         }
         if (ALL_PERMISSIONS.equals(user.getDataAll())) {
             return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
         }
         ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
-        Set<Integer> cityList =  setObjectRestResponse.getData();
+        Set<Integer> cityList = setObjectRestResponse.getData();
         appUserManageDTO.setCitySet(cityList);
-        return  ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
+        return ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
     }
 
     /**
      * 根据用户id获取用户详情
+     *
      * @param userId
      * @return
      */
     @GetMapping("/user_info/{id}")
-    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
-         AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
-         return ObjectRestResponse.succ(appUserManageVo);
+    public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId) {
+        AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);
+        return ObjectRestResponse.succ(appUserManageVo);
     }
+
     /**
      * 查询一条
+     *
      * @param id
      * @return
      */
     @GetMapping("/findOneById/{id}")
-    public ObjectRestResponse<AppUserVo> findOneById(@PathVariable Integer id){
+    public ObjectRestResponse<AppUserVo> findOneById(@PathVariable Integer id) {
         return ObjectRestResponse.succ(baseBiz.findOneById(id));
     }
 
     /**
      * 保存
+     *
      * @param appUserVo
      * @return
      */
     @PostMapping("/save")
-    public ObjectRestResponse save(@RequestBody AppUserVo  appUserVo){
+    public ObjectRestResponse save(@RequestBody AppUserVo appUserVo) {
         baseBiz.save(appUserVo);
         return ObjectRestResponse.succ();
     }
 
     /**
      * 禁用
+     *
      * @param appUserId
      * @return
      */
     @PutMapping("/disable/{appUserId}")
-    public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId){
+    public ObjectRestResponse disable(@PathVariable("appUserId") Integer appUserId) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setStatus(Status.FORBIDDEN);
         appUserLogin.setId(appUserId);
@@ -113,11 +129,12 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
 
     /**
      * 取消禁用
+     *
      * @param appUserId
      * @return
      */
     @PutMapping("/available/{appUserId}")
-    public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId){
+    public ObjectRestResponse available(@PathVariable("appUserId") Integer appUserId) {
         AppUserLogin appUserLogin = new AppUserLogin();
         appUserLogin.setStatus(Status.AVAILABLE);
         appUserLogin.setId(appUserId);
@@ -127,19 +144,27 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
 
     /**
      * 删除用户
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/deleteById/{id}")
-    public ObjectRestResponse deleteById(@PathVariable Integer id){
+    public ObjectRestResponse deleteById(@PathVariable Integer id) {
         appUserLoginBiz.deleteAppUserById(id);
         return ObjectRestResponse.succ();
     }
 
     @PutMapping("/user_position")
-    public ObjectRestResponse<Void> setUserPositionById(@RequestParam("id") Integer id,@RequestParam("positionId") Integer positionId){
-         appUserDetailBiz.updateUserPositionByUserId(id,positionId);
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<Void> setUserPositionById(@RequestParam("id") Integer id, @RequestParam("positionId") Integer positionId, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserLoginBiz.updateUserPosition(id, positionId,operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
     }
-}
 
+}

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

@@ -114,7 +114,7 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId));
+            return ObjectRestResponse.succ(appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId)) ;
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");
@@ -138,7 +138,8 @@ public class AppUserPositionController {
         try {
             IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
             Integer operatorId = Integer.valueOf(infoFromToken.getId());
-            return ObjectRestResponse.succ(appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO, operatorId));
+            appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO, operatorId);
+            return ObjectRestResponse.succ();
         } catch (Exception e) {
             log.error("修改失败【{}】", e);
             throw new BaseException("修改失败");

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java

@@ -96,7 +96,7 @@ public enum StatisticsStatusEnum {
                     x.getPayWay() == null ? NO_PAY_WAY : x.getPayWay()
                     , x.getHasPay()));
             stisticsActiveState.add(x.getStateGroup());
-        }).collect(Collectors.partitioningBy(x -> Objects.nonNull(x.getPayWay()), Collectors.groupingBy(OrderDTO::getStateGroup, Collectors.toList())));
+        }).collect(Collectors.partitioningBy(x -> Objects.equals(x.getHasPay(),1), Collectors.groupingBy(OrderDTO::getStateGroup, Collectors.toList())));
         return stateGroupMap == null ? Collections.EMPTY_MAP : stateGroupMap;
     }
 

xx-order/xx-order-server/src/main/resources/mapper/OrderMemberReceivedStatisticsMapper.xml

@@ -30,7 +30,7 @@
     </resultMap>
 
     <select id="selectOrderMemberReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
-        select `date`,`year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+        select `date`,`year`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
          IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0) as `totalGoldQuantity`,
          IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
         <if test="orderState!=null">
@@ -60,7 +60,7 @@
     </select>
 
     <select id="selectOrderMemberReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
-        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
+        select `year`,`month`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`,
         IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0) as `totalGoldQuantity`,
         IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
         <if test="orderState!=null">
@@ -90,7 +90,7 @@
     </select>
 
     <select id="selectOrderMemberReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderMemberReceivedStatistics">
-        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity`,IFNULL(sum(`toal_common_ammount`),0) as `toalCommonAmmount`
         ,IFNULL(sum(`total_common_quantity`),0) as `totalCommonQuantity`,IFNULL(sum(`total_gold_amount`),0) as `totalGoldAmount`,IFNULL(sum(`total_gold_quantity`),0) as `totalGoldQuantity`,
         IFNULL(sum(`total_diamond_ammount`),0) as `totalDiamondAmmount`,IFNULL(sum(`total_diamond_quantity`),0) as `totalDiamondQuantity` from  `order_member_received_statistics` where 1=1
         <if test="orderState!=null">

xx-order/xx-order-server/src/main/resources/mapper/OrderReceivedStatisticsMapper.xml

@@ -32,7 +32,7 @@
     </resultMap>
 
     <select id="selectOrderReceivedStatisticsDateList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
-        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        select `year`,`date`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -61,7 +61,7 @@
     </select>
 
     <select id="selectOrderReceivedStatisticsMonthList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
-        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        select `year`,`month`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -90,7 +90,7 @@
     </select>
 
     <select id="selectOrderReceivedStatisticsWeekOfYearList" resultType="com.xxfc.platform.order.entity.OrderReceivedStatistics">
-        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>

xx-order/xx-order-server/src/main/resources/mapper/OrderRentVehicleReceivedStatisticsMapper.xml

@@ -19,7 +19,7 @@
         <result property="crtTime" column="crt_time"/>
     </resultMap>
     <select id="selectOrderRentVehicleReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
-        select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        select `year`,`date`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -47,7 +47,7 @@
     </select>
 
     <select id="selectOrderRentVehicleReceivedStatisticsGroupByMonth"  resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
-        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        select `year`,`month`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -75,7 +75,7 @@
     </select>
 
     <select id="selectOrderRentVehicleReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderRentVehicleReceivedStatistics">
-        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from `order_rent_vehicle_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>

xx-order/xx-order-server/src/main/resources/mapper/OrderTourReceivedStatisticsMapper.xml

@@ -24,7 +24,7 @@
     </resultMap>
 
     <select id="selectOrderTourReceivedStatisticsGroupByDate" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
-         select `year`,`date`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+         select `year`,`date`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -52,7 +52,7 @@
     </select>
 
     <select id="selectOrderTourReceivedStatisticsGroupByMonth" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
-        select `year`,`month`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        select `year`,`month`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>
@@ -80,7 +80,7 @@
     </select>
 
     <select id="selectOrderTourReceivedStatisticsGroupByWeekOfYear" resultType="com.xxfc.platform.order.entity.OrderTourReceivedStatistics">
-        select `year`,`week_of_year`,IFNULL(sum(`total_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
+        select `year`,`week_of_year`,IFNULL(sum(`total_amount`-`order_refund_amount`),0) as `totalAmount`,IFNULL(sum(`total_quantity`),0) as `totalQuantity` from  `order_tour_received_statistics` where 1=1
         <if test="orderState!=null">
             and `has_pay`=#{orderState}
         </if>

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -127,14 +127,13 @@ public class ServiceTest {
     public void testOrderReceivedStatisticsJobHandler(){
         cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
-     /*   orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
-        LocalDate startLocalDate = LocalDate.of(2019, 11, 30);
+//        orderReceivedStatisticsJobHandler.execute("2019-10-08");
+        LocalDate startLocalDate = LocalDate.of(2019, 10, 01);
         LocalDate endLocalDate = LocalDate.of(2019,12,19);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);
             orderReceivedStatisticsJobHandler.execute(dateStr);
         }
-
     }
 }