add:套餐分类查询

fs-service/src/main/java/com/fs/hisStore/param/FsUserEditParam.java

@@ -19,6 +19,10 @@ public class FsUserEditParam implements Serializable
 
     private Long userId;
 
+
+
+    private Integer isWeixinAuth;
+
     // 添加兼容方法
     public String getNickName() {
         return this.nickName != null ? this.nickName : this.nickname;
@@ -38,4 +42,13 @@ public class FsUserEditParam implements Serializable
         this.nickname = nickname;
         this.nickName = nickname;
     }
+
+
+    public Integer getIsWeixinAuth() {
+        return isWeixinAuth;
+    }
+
+    public void setIsWeixinAuth(Integer isWeixinAuth) {
+        this.isWeixinAuth = isWeixinAuth;
+    }
 }

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

@@ -3,9 +3,16 @@ package com.fs.app.controller.store;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.entity.SysDictData;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyService;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
 import com.fs.hisStore.domain.FsStoreProductPackageScrm;
 import com.fs.hisStore.domain.FsStoreProductScrm;
@@ -17,6 +24,7 @@ import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
 import com.fs.hisStore.service.IFsStoreProductPackageScrmService;
 import com.fs.hisStore.service.IFsStoreProductScrmService;
 import com.fs.hisStore.vo.FsStoreProductPacketVO;
+import com.fs.system.service.ISysDictTypeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -40,6 +48,42 @@ public class StoreProductPackageScrmController extends AppBaseController {
     private IFsStoreProductAttrValueScrmService attrValueService;
     @Autowired
     private IFsStoreProductScrmService storeProductService;
+    @Autowired
+    private ICompanyUserService companyUserService;
+    @Autowired
+    private ICompanyService companyService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+    @ApiOperation("获取套餐分类")
+    @GetMapping("/getPackagCateList")
+    public R getPackagCateList() {
+        List<SysDictData> result = new ArrayList<>();
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            Long companyUserId = getCompanyUserId();
+            CompanyUser companyUser=companyUserService.selectCompanyUserById(companyUserId);
+            Company company = companyService.selectCompanyById(companyUser.getCompanyId());
+            String packageCateIds = company.getPackageCateIds();
+            List<String> cateIdList = objectMapper.readValue(packageCateIds, new TypeReference<List<String>>() {});
+            if(!cateIdList.isEmpty()){
+                List<SysDictData> data = dictTypeService.selectDictDataByType("store_product_package_cate");
+                if(data != null && !data.isEmpty()){
+
+                    data.stream().forEach(item->{
+                       if (cateIdList.contains(item.getDictValue())) {
+                           result.add(item);
+                       }
+                   });
+                }
+            }
+
+        } catch (Exception e) {
+        } finally {
+            return R.ok().put("data", result);
+        }
+
+    }
+
     @Login
     @ApiOperation("获取套餐列表")
     @GetMapping("/getStoreProductPackage")

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

@@ -612,6 +612,10 @@ public class UserScrmController extends AppBaseController {
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
         user.setNickname(StringUtils.isNotBlank(param.getNickname())?param.getNickName():param.getNickname());
+        Integer isWeixinAuth = param.getIsWeixinAuth();
+        if (isWeixinAuth!=null){
+            user.setIsWeixinAuth(isWeixinAuth);
+        }
         if(userService.updateFsUser(user)>0){
             return R.ok("修改成功");
         }