|
@@ -6,15 +6,21 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
|
|
|
import com.ruoyi.common.security.annotation.InnerAuth;
|
|
import com.ruoyi.common.security.annotation.InnerAuth;
|
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
|
import com.ruoyi.front.service.IWxService;
|
|
import com.ruoyi.front.service.IWxService;
|
|
|
|
|
+import com.ruoyi.logistics.domain.SysDeptRate;
|
|
|
|
|
+import com.ruoyi.logistics.service.ISysDeptRateService;
|
|
|
import com.ruoyi.system.api.domain.SysUser;
|
|
import com.ruoyi.system.api.domain.SysUser;
|
|
|
import com.ruoyi.system.api.model.LoginUser;
|
|
import com.ruoyi.system.api.model.LoginUser;
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
import com.ruoyi.system.service.ISysPermissionService;
|
|
import com.ruoyi.system.service.ISysPermissionService;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -36,6 +42,9 @@ public class WxMiniController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISysConfigService configService;
|
|
private ISysConfigService configService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ISysDeptRateService sysDeptRateService;
|
|
|
|
|
+
|
|
|
@InnerAuth
|
|
@InnerAuth
|
|
|
@GetMapping("/getOpenId")
|
|
@GetMapping("/getOpenId")
|
|
|
public R<String> getOpenId(@RequestParam("jsCode") String jsCode) {
|
|
public R<String> getOpenId(@RequestParam("jsCode") String jsCode) {
|
|
@@ -95,6 +104,27 @@ public class WxMiniController {
|
|
|
SysUser user = loginUser.getSysUser();
|
|
SysUser user = loginUser.getSysUser();
|
|
|
AjaxResult ajax = AjaxResult.success();
|
|
AjaxResult ajax = AjaxResult.success();
|
|
|
ajax.put("user", user);
|
|
ajax.put("user", user);
|
|
|
|
|
+
|
|
|
|
|
+ SysDeptRate sysDeptRate = new SysDeptRate();
|
|
|
|
|
+ sysDeptRate.setDeptId(user.getDeptId());
|
|
|
|
|
+ List<SysDeptRate> sysDeptRates = sysDeptRateService.selectSysDeptRateList(sysDeptRate);
|
|
|
|
|
+
|
|
|
|
|
+ // 判断物流公司类型是否存在
|
|
|
|
|
+ Map<String, Boolean> companyTypeMap = new HashMap<>();
|
|
|
|
|
+ companyTypeMap.put("jd", false);
|
|
|
|
|
+ companyTypeMap.put("sf", false);
|
|
|
|
|
+
|
|
|
|
|
+ if (CollectionUtils.isNotEmpty(sysDeptRates)) {
|
|
|
|
|
+ for (SysDeptRate rate : sysDeptRates) {
|
|
|
|
|
+ if ("1".equals(rate.getCompanyType())) {
|
|
|
|
|
+ companyTypeMap.put("jd", true);
|
|
|
|
|
+ } else if ("2".equals(rate.getCompanyType())) {
|
|
|
|
|
+ companyTypeMap.put("sf", true);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ ajax.put("menu", companyTypeMap);
|
|
|
return ajax;
|
|
return ajax;
|
|
|
}
|
|
}
|
|
|
|
|
|