Kaynağa Gözat

fix: 收款统计bug修复

xdd 1 ay önce
ebeveyn
işleme
6fe30f9269

+ 1 - 1
fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -190,7 +190,7 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService
         }
 
         if (order.getCompanyId()==null||order.getCompanyUserId()==null){
-            if (order.getStatus()!=OrderInfoEnum.STATUS_1.getValue()){
+            if (Objects.equals(order.getStatus(), OrderInfoEnum.STATUS_0.getValue())){
                 throw new CustomException("不可申请售后");
             }
 

+ 2 - 2
fs-service-system/src/main/resources/mapper/store/FsStoreAfterSalesMapper.xml

@@ -85,10 +85,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 s.`company_user_id`,
                 s.`is_package`,
                 s.`package_json`,
+                s.`delivery_sn` as `delivery_sn`,
+                s.`delivery_name` as `delivery_name`,
                deliver.status as delivery_status,
                deliver.deliver_id as delivery_id,
-                deliver.deliver_sn as `delivery_sn`,
-                deliver.deliver_name as `delivery_name`,
                u.phone as user_phone,
                c.company_name ,cu.nick_name as company_user_nick_name ,
                cu.phonenumber as company_usere_phonenumber