Bladeren bron

收款管理,订单支付记录添加一键线下自提发货

yh 2 weken geleden
bovenliggende
commit
2d2b2ac414

+ 2 - 2
fs-admin/src/main/java/com/fs/hisStore/controller/FsStorePaymentScrmController.java

@@ -350,10 +350,10 @@ public class FsStorePaymentScrmController extends BaseController
      * **/
     @Log(title = "发货同步导入", businessType = BusinessType.IMPORT)
     @PostMapping("/oneClickShipping")
-    public R oneClickShipping() {
+    public R oneClickShipping(@RequestBody FsStorePaymentParam fsStorePayment) {
 
         try {
-            return fsStorePaymentService.oneClickShipping();
+            return fsStorePaymentService.oneClickShipping(fsStorePayment);
         }catch (Exception e){
             e.getStackTrace();
         }

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -393,7 +393,7 @@ public interface FsStorePaymentScrmMapper
      * 获取查询用户支付信息
      * @return list
      **/
-    List<FsStorePaymentUsetVo> getPaymentUsetInfoList();
+    List<FsStorePaymentUsetVo> getPaymentUsetInfoList(FsStorePaymentParam fsStorePayment);
 
     /**
      * 批量更新发货状态

+ 1 - 1
fs-service/src/main/java/com/fs/hisStore/service/IFsStorePaymentScrmService.java

@@ -123,7 +123,7 @@ public interface IFsStorePaymentScrmService
     /**
      * 批量导入更新微信订单发货状态
      * **/
-    R oneClickShipping();
+    R oneClickShipping(FsStorePaymentParam fsStorePayment);
 
     String updateFsStorePaymentByDecryptForm(Long paymentId);
 

+ 2 - 2
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -983,7 +983,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
     }
 
     @Override
-    public R oneClickShipping() {
+    public R oneClickShipping(FsStorePaymentParam fsStorePayment) {
         try {
             StringBuilder builder = new StringBuilder();
             //获取商城配置
@@ -992,7 +992,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
             //验证是否开启微信发货
             if (config.getIsWeChatShipping() != null && config.getIsWeChatShipping()) {
                 //获取支付信息
-                List<FsStorePaymentUsetVo> paymentList = fsStorePaymentMapper.getPaymentUsetInfoList();
+                List<FsStorePaymentUsetVo> paymentList = fsStorePaymentMapper.getPaymentUsetInfoList(fsStorePayment);
                 if (paymentList.isEmpty()) {
                     return R.ok("操作成功,暂无同步订单信息!");
                 }

+ 1 - 1
fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             fs_store_payment_scrm sp
                 LEFT JOIN fs_user fu ON sp.user_id = fu.user_id
         WHERE
-            sp.status = 1  and sp.app_id is not null  and sp.is_shipment = 0 and sp.business_type = 1 AND sp.pay_time > '2025-11-27 00:00:00'
+            sp.status = 1  and sp.app_id is not null  and sp.is_shipment = 0 and sp.business_type = #{businessType} AND sp.pay_time > '2025-11-27 00:00:00'
             order by sp.pay_time desc LIMIT 500
     </select>