销售会员相关优化

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -11,7 +11,9 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.cache.ICompanyUserCacheService;
+import com.fs.course.domain.FsUserCompanyUser;
 import com.fs.course.dto.BatchSendCourseDTO;
+import com.fs.course.mapper.FsUserCompanyUserMapper;
 import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.framework.security.LoginUser;
@@ -30,6 +32,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -64,6 +67,9 @@ public class FsUserAdminController extends BaseController {
     @Autowired
     private OpenIMService openIMService;
 
+    @Autowired
+    private FsUserCompanyUserMapper fsUserCompanyUserMapper;
+
     @PreAuthorize("@ss.hasPermi('user:fsUser:list')")
     @PostMapping("/list")
     @ApiOperation("会员列表(与移动端使用的相同查询)")
@@ -154,6 +160,17 @@ public class FsUserAdminController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody FsUser fsUser)
     {
+        //更新关联表状态
+        FsUserCompanyUser update = new FsUserCompanyUser();
+        update.setId(fsUser.getUcuId());
+        if(fsUser.getStatus() == 2 || fsUser.getStatus() == 0){//如果为禁用状态
+            update.setStatus(fsUser.getStatus());
+            fsUser.setStatus(null);
+        } else {
+            update.setStatus(1);
+        }
+
+        fsUserCompanyUserMapper.updateById(update);
         return toAjax(fsUserService.updateFsUser(fsUser));
     }
 

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -206,6 +206,10 @@ public class FsUser extends BaseEntity
     @TableField(exist = false)
     private String nickname;
 
+    //关联中间表id
+    @TableField(exist = false)
+    private Long ucuId;
+
     public String getNickname() {
         return nickname;
     }

fs-service/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -106,4 +106,6 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "是否购买 1：是 0 否")
     private BigDecimal isBuy;
 
+    //关联表id
+    private Long ucuId;
 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -345,7 +345,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ucu.company_id,
         ucu.project_id,
         fs_user.integral,
-        if(fs_user.pay_count>0,1,0) as isBuy
+        if(fs_user.pay_count>0,1,0) as isBuy,
+        ucu.id AS ucuId
         FROM
         fs_user
         left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -1643,6 +1643,7 @@ public class StoreOrderScrmController extends AppBaseController {
     @Login
     @PostMapping("/cachePayInfo")
     public R cachePayInfo(@RequestBody Map<String, Object> vo) {
+        logger.info("缓存支付信息------------------------>{}",vo);
         String cateIds = vo.get("cateIds").toString();
         List<FsStoreCartQueryVO> carts = cartMapper.selectFsStoreCartListByIds(cateIds);
         if ("2".equals(vo.get("payType").toString())) {