浏览代码

feat: 文件上传调整;月结卡号查询;

hanchaolong 2 天之前
父节点
当前提交
7b051c0eab

+ 1 - 0
jd-logistics-modules/jd-logistics-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.file.utils.FileUploadUtils;
  * 
  * @author lydgt
  */
+@Primary
 @Service
 public class LocalSysFileServiceImpl implements ISysFileService
 {

+ 0 - 1
jd-logistics-modules/jd-logistics-file/src/main/java/com/ruoyi/file/service/OBSSysFileServiceImpl.java

@@ -26,7 +26,6 @@ import java.util.Base64;
  *
  * @author lydgt
  */
-@Primary
 @Service
 public class OBSSysFileServiceImpl implements ISysFileService
 {

+ 25 - 4
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/MonthQRCodeController.java

@@ -6,13 +6,12 @@ import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.logistics.config.SFExpressConfig;
 import com.ruoyi.logistics.service.IMonthQRCodeTaskService;
 import com.ruoyi.logistics.service.LogisticsOrderService;
+import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
 
 /**
  * WX-月结二维码生成
@@ -30,6 +29,16 @@ public class MonthQRCodeController extends BaseController {
     @Autowired
     private IMonthQRCodeTaskService monthQRCodeService;
 
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private SFExpressConfig sfExpressConfig;
+
+    /**
+     * 获取月结二维码
+     * @return
+     */
     @RequestMapping
     public AjaxResult qrcode(@RequestParam("source") Integer source) {
         try{
@@ -53,4 +62,16 @@ public class MonthQRCodeController extends BaseController {
             throw new RuntimeException(e);
         }
     }
+
+    /**
+     * 获取月结卡号
+     * @return
+     */
+    @GetMapping("/getMonthCard")
+    public AjaxResult getMonthCard(@RequestParam("source") Integer source) {
+        if (source == 1) {
+            return success(configService.selectConfigByKey("jd.logistics.customercode"));
+        }
+        return success(sfExpressConfig.getMonthlyCord());
+    }
 }