注销账号

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/SysUserController.java

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.yonge.cooleshow.api.feign.dto.ApiWrapper;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -22,6 +22,8 @@ public class SysUserController extends BaseController {
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     /**
      * 账号注销校验
@@ -41,4 +43,13 @@ public class SysUserController extends BaseController {
         return HttpResponseResult.succeed(true);
     }
 
+    @ApiOperation(value = "用户注销账号校验")
+    @GetMapping(value = "/logoffUser/{id}")
+    public HttpResponseResult<Void> logoffUser(@PathVariable("id") Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserById(id);
+        if (sysUser == null) {
+            return failed("用户不存在");
+        }
+        return sysUserFeignService.logoffUser(id);
+    }
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -83,4 +83,8 @@ public interface SysUserFeignService {
 	@ApiOperation(value = "获取登录用户client")
 	HttpResponseResult<String> client();
 
+    @ApiOperation(value = "用户注销账号校验")
+    @GetMapping(value = "/user/logoffUser/{id}")
+    HttpResponseResult<Void> logoffUser(@PathVariable("id") Long id);
+
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -97,4 +97,9 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return null;
 	}
 
+    @Override
+    public HttpResponseResult<Void> logoffUser(Long id) {
+        return null;
+    }
+
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -457,14 +457,13 @@ public class UserController extends BaseController {
     }
 
     @ApiOperation(value = "用户注销账号校验")
-    @GetMapping(value = "/logoffCheck")
-    public HttpResponseResult<List<String>> logoffCheck() {
-        AuthUser authUser = SecurityUtils.getUser();
-        SysUser sysUser = sysUserService.get(authUser.getUserId());
+    @GetMapping(value = "/logoffUser/{id}")
+    public HttpResponseResult<Void> logoffUser(@PathVariable("id") Long id) {
+        SysUser sysUser = sysUserService.get(id);
         if (sysUser == null) {
             return failed("用户不存在");
         }
-        return sysUserService.logoffCheckByPhone(sysUser.getPhone());
+        return sysUserService.logoffByPhone(sysUser.getPhone());
     }
 
     @ApiOperation(value = "刷新token")

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -366,7 +366,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
         orderItemDao.insertList(orderItemList);
         //如使用优惠券更新优惠券使用状态
-        if (orderParam.getCouponId() != null) {
+        if (!StringUtil.isEmpty(orderParam.getCouponId())) {
             // updateCouponStatus(orderParam.getCouponId(), currentMember.getId(), 1);
             // todo 远程调用更新优惠券使用
             adminFeignService.updateCouponOrderInfo(orderParam.getCouponId(),false,order.getOrderSn());
@@ -575,7 +575,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             // updateCouponStatus(cancelOrder.getCouponId(), cancelOrder.getMemberId(), 0);
             // todo 退回优惠券
 
-            adminFeignService.updateCouponOrderInfo(cancelOrder.getCouponId(),true,cancelOrder.getOrderSn());
+            if (!StringUtil.isEmpty(cancelOrder.getCouponId())) {
+                adminFeignService.updateCouponOrderInfo(cancelOrder.getCouponId(), true, cancelOrder.getOrderSn());
+            }
             //返还使用积分
             if (cancelOrder.getUseIntegration() != null) {
                 UmsMember member = memberService.getById(cancelOrder.getMemberId());

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/OmsOrderReturnApplyDao.xml

@@ -65,7 +65,7 @@
     <select id="getCheckOrder" resultMap="returnApplyDetailResult">
         select t.*,o.platform_type as platformType from oms_order_return_apply t
         left join oms_order o on t.order_id = o.id
-        where o.user_id = #{userId} and t.status in (0,1)
+        where o.member_id = #{userId} and t.status in (0,1)
 
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -311,6 +311,21 @@ public class SysUserServiceImpl implements SysUserService {
                 } else {
                     courseMsg="账号存在未下架的视频课";
                 }
+            } else {
+                // 判断审核中的视频课
+
+                videoCourse = videoLessonGroupService.lambdaQuery()
+                    .eq(VideoLessonGroup::getTeacherId, userId)
+                    .eq(VideoLessonGroup::getAuditStatus, AuthStatusEnum.DOING)
+                    .count();
+                if (videoCourse > 0) {
+                    if (courseMsg.length() > 0) {
+                        courseMsg+="和未下架的视频课";
+                    } else {
+                        courseMsg="账号存在未下架的视频课";
+                    }
+                }
+
             }
             if (courseMsg.length() > 0) {
                 errMsg.add(courseMsg);
@@ -320,7 +335,8 @@ public class SysUserServiceImpl implements SysUserService {
             UserAccountVo detail = userAccountService.detail(userId);
             if (detail != null && (detail.getAmountTotal().compareTo(BigDecimal.ZERO) > 0
                 || detail.getAmountUsable().compareTo(BigDecimal.ZERO) > 0
-                || detail.getAmountFrozen().compareTo(BigDecimal.ZERO) > 0)) {
+                || detail.getAmountFrozen().compareTo(BigDecimal.ZERO) > 0)
+                || detail.getAmountUnrecorded().compareTo(BigDecimal.ZERO) > 0) {
                 errMsg.add("收入未结算/推广计划未入账");
             }
 
@@ -340,6 +356,7 @@ public class SysUserServiceImpl implements SysUserService {
                 strings = new ArrayList<>();
             }
             strings.addAll(errMsg);
+            result.put(ClientEnum.TEACHER.name(), strings);
 
         }
 
@@ -412,12 +429,12 @@ public class SysUserServiceImpl implements SysUserService {
             StringBuffer result = new StringBuffer("");
             if (v.contains(CheckStatus.WAIT_PAY)){
                 result.append("待支付");
-            } else if (v.contains(CheckStatus.WAIT_CONFIRM)){
+            } if (v.contains(CheckStatus.WAIT_CONFIRM)){
                 if (result.length() > 0) {
                     result.append("/");
                 }
                 result.append("未确认收货");
-            } else if (v.contains(CheckStatus.WAIT_AFTER_SALE)){
+            } if (v.contains(CheckStatus.WAIT_AFTER_SALE)){
                 if (result.length() > 0) {
                     result.append("/");
                 }