Merge remote-tracking branch 'origin/master'

jd-logistics-auth/src/main/java/com/ruoyi/auth/controller/WxMiniController.java

@@ -24,6 +24,11 @@ public class WxMiniController {
     @Autowired
     private TokenService tokenService;
 
+    /**
+     * 小程序授权登录
+     * @param form
+     * @return
+     */
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form) {
         // 用户登录
@@ -32,4 +37,17 @@ public class WxMiniController {
         return R.ok(tokenService.createToken(userInfo));
     }
 
+    /**
+     * 小程序账户密码登录
+     * @param form
+     * @return
+     */
+    @PostMapping("pdlogin")
+    public R<?> pdlogin(@RequestBody LoginBody form)
+    {
+        // 用户登录
+        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        // 获取登录token
+        return R.ok(tokenService.createToken(userInfo));
+    }
 }

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
 {

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
 {

jd-logistics-modules/jd-logistics-job/src/main/java/com/ruoyi/job/task/FinancialMonthSummaryTask.java

@@ -36,6 +36,19 @@ public class FinancialMonthSummaryTask {
         String formattedDate = lastMonth.format(formatter);
         Map param= new HashMap();
         param.put("monthCode",formattedDate);
+        param.put("deptId","");
+        remoteMonthSummaryService.creatMontSummary(param);
+    }
+
+    /**
+     * 每个月月初 执行生成上个月的月度账单
+     * @author zxf
+     */
+    public void doTask(String  deptId,String monthCode) {
+        logger.info("月度汇总按照传值月份供应商定时任务开始");
+        Map param= new HashMap();
+        param.put("monthCode",monthCode);
+        param.put("deptId",deptId);
         remoteMonthSummaryService.creatMontSummary(param);
     }
 

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());
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/MonthQRCodeTaskServiceImpl.java

@@ -28,6 +28,7 @@ import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -103,6 +104,9 @@ public class MonthQRCodeTaskServiceImpl implements IMonthQRCodeTaskService {
         if (response.getWaybillQRVerifyInfoList() != null && response.getWaybillQRVerifyInfoList().size() > 0) {
 
             for (WaybillQRVerifyInfo waybillQRVerifyInfo : response.getWaybillQRVerifyInfoList()) {
+                if (CollectionUtils.isEmpty(monthQRCodeDTO.getProcessWaybillCodes())) {
+                    monthQRCodeDTO.setProcessWaybillCodes(new ArrayList<>());
+                }
                 // 判断订单是否已经处理过
                 if (monthQRCodeDTO.getProcessWaybillCodes().contains(waybillQRVerifyInfo.getWaybillCode())) {
                     continue;

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/RptFinancialMonthSummaryServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,9 +116,12 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
         // 格式化上个月日期为字符串
         String formattedDate = lastMonth.format(formatter);
         //按照传值条件查询统计账单情况
-        param.put("monthCode",param.get("monthCode")!=null?param.get("monthCode").toString():formattedDate);
-        param.put("deptId",param.get("deptId")!=null?param.get("deptId"):null);
+        param.put("monthCode",StringUtils.isNotBlank(param.get("monthCode").toString())?param.get("monthCode").toString():formattedDate);
+        param.put("deptId", StringUtils.isNotBlank(param.get("deptId").toString())?param.get("deptId").toString():null);
         List<Map<String,Object>> monthSummaryList=rptFinancialMonthSummaryMapper.selectMonthSummaryList(param);
+        if(monthSummaryList.size()==0){
+            return 0;
+        }
         return rptFinancialMonthSummaryMapper.insertBachRptFinancialMonthSummary(monthSummaryList);
     }