xuhy
2023-06-14 17f18c3d56a70327874aa7dda0adfa2f5e3dafce
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAppUserController.java
@@ -8,14 +8,12 @@
import com.stylefeng.guns.modular.system.enums.CouponStatusEnum;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
import com.stylefeng.guns.modular.system.exports.TAppUserExceptionExport;
import com.stylefeng.guns.modular.system.model.TAppUser;
import com.stylefeng.guns.modular.system.model.TCoupon;
import com.stylefeng.guns.modular.system.model.TOrder;
import com.stylefeng.guns.modular.system.model.TUserToCoupon;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITAppUserService;
import com.stylefeng.guns.modular.system.service.ITCouponService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import com.stylefeng.guns.modular.system.service.ITUserToCouponService;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -58,6 +56,8 @@
    private ITOrderService tOrderService;
    @Autowired
    private ITUserToCouponService tUserToCouponService;
    @Autowired
    private RedisUtil redisUtil;
    /**
     * 跳转到首页
@@ -175,6 +175,7 @@
        EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
        // 是否异常
        wrapper.eq("is_exception",2);
        wrapper.orderBy("createTime",false);
        List<TAppUser> tAppUsers = tAppUserService.selectList(wrapper);
        return tAppUserService.getTAppUserResp(tAppUsers);
@@ -194,6 +195,7 @@
                          Integer status) {
        EntityWrapper<TAppUser> wrapper = tAppUserService.getUserListWrapper(createTime,nickname,phone,id,status);
        wrapper.ne("is_exception",2);
        wrapper.orderBy("createTime",false);
        return tAppUserService.selectList(wrapper);
    }
@@ -237,6 +239,9 @@
        TAppUser tAppUser = tAppUserService.selectById(id);
        if(1 == status){
            tAppUser.setStatus(2);
            String value = redisUtil.getValue("USER_" + tAppUser.getPhone());
            redisUtil.remove(value);
            redisUtil.remove("USER_" + tAppUser.getPhone());
        }
        if(2 == status){
            tAppUser.setStatus(1);
@@ -311,7 +316,7 @@
                values[i][7] = d.getEmergencyContact();
                values[i][8] = d.getEmergencyPhone();
                values[i][9] = String.valueOf(d.getAccountBalance());
                values[i][10] = String.valueOf(d.getUserTagId());
                values[i][10] = String.valueOf(Objects.nonNull(d.getUserTagId())?d.getUserTagId():"");
                Integer status1 = d.getStatus();
                if(1 == status1){
                    values[i][11] = "正常";