bug修改,后台新增修改用户积分

无关风月

20 小时以前 b1a6188c6b3d3454d32440c555e41402739afbc9

bug修改,后台新增修改用户积分

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -699,8 +699,7 @@
                integral = integral - updateIntegral.getIntegral();
                break;
        }
        appUser.setIntegral(integral);
        appUserService.updateById(appUser);

        UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
        userIntegralChanges.setAppUserId(updateIntegral.getId());
        userIntegralChanges.setType(1);
@@ -710,6 +709,8 @@
        userIntegralChanges.setInsertTime(new Date());
        userIntegralChanges.setCategory(updateIntegral.getChangeType());
        userIntegralChangesService.save(userIntegralChanges);
        appUser.setIntegral(integral);
        appUserService.updateById(appUser);
        return true;
    }


 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1528,7 +1528,7 @@
                pointsMerchandise.setPaymentTime(new Date());
            }
            returnId = mcClient.saveDetailsUserPointMercase(pointsMerchandise);
            if(goodsNums>0){
            if(goodsNums>1){
                System.err.println("购买商品数量"+goodsNums);
                List<UserPointsMerchandise> userPointsMerchandises = new ArrayList<>();
                for (int i = 1; i < goodsNums; i++) {

 cloud-server-communityWorldCup/src/main/resources/logback-spring.xml

@@ -24,7 +24,7 @@
    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>debug</level>
            <level>info</level>
        </filter>
        <encoder>
            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
@@ -223,7 +223,7 @@
            <appender-ref ref="ERROR_FILE"/>
            <appender-ref ref="ALL_FILE"/>
        </root>
        <logger name="com.dsh.course.mapper" level="error"/>
        <logger name="com.dsh.course.mapper" level="debug"/>
        <logger name="business-log" level="warn"/>
    </springProfile>


 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java

@@ -1344,9 +1344,9 @@
    @ResponseBody
    @RequestMapping(value = "/addOperator")
    public ResultUtil addOperator(String name,String userName,String phone,Integer type , String comArr) {
        User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
        if (one!=null){
            return ResultUtil.error("当前管理员名称和电话已存在!");
        List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).list();
        if (!list.isEmpty()){
            return ResultUtil.error("当前管理员手机号已存在!");
        }
        User user = new User();
        user.setName(userName);
@@ -1434,9 +1434,9 @@
    @RequestMapping(value = "/updateOperator")
    public ResultUtil updateOperator(Integer id,String name,String userName
            ,String phone,Integer type ,@RequestParam String comArr) {
        User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
        if (one!=null){
            return ResultUtil.error("当前管理员名称和电话已存在!");
        List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).ne(User::getId, id).list();
        if (!list.isEmpty()){
            return ResultUtil.error("当前管理员手机号已存在!");
        }
        operatorCityService.remove(new QueryWrapper<TOperatorCity>().eq("operatorId",id));
        User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id).