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

puzhibing

2023-06-02 f604f87781d7cdae5571465a3bafffff53313028

 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;

    /**
     * 跳转到首页
@@ -239,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);