Merge remote-tracking branch 'origin/master'

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/Kd100Controller.java

@@ -1,19 +1,13 @@
 package com.ruoyi.front.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.front.service.impl.Kuaidi100Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -35,7 +29,7 @@ public class Kd100Controller {
    @Autowired
    RedisTemplate redisTemplate;
 
-    @PostMapping("/queryExpres")
+   @GetMapping("/test") @PostMapping("/queryExpres")
     public AjaxResult queryExpres(@RequestBody Map param)  {
         try {
             logger.info("调用快递100查询实时快递接口  运单号: {}", param.get("number"));
@@ -61,6 +55,4 @@ public class Kd100Controller {
 
 
     }
-
-
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WxMiniController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.front.service.IWxService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysUserService;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -32,6 +33,9 @@ public class WxMiniController {
     @Autowired
     private ISysPermissionService permissionService;
 
+    @Autowired
+    private ISysConfigService configService;
+
     @InnerAuth
     @GetMapping("/getOpenId")
     public R<String> getOpenId(@RequestParam("jsCode") String jsCode) {
@@ -93,4 +97,14 @@ public class WxMiniController {
         ajax.put("user", user);
         return ajax;
     }
+
+    /**
+     * 联系客服，通过获取系统参数得到
+     */
+    @GetMapping("/getContact")
+    public AjaxResult getContact() {
+        //通过系统参数rj.customer.service，获取客服电话
+        return AjaxResult.success(configService.selectConfigByKey("rj.customer.service"));
+    }
+
 }