yangdamao 1 年之前
父节点
当前提交
5cb0c9af68

+ 2 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3218,8 +3218,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }else {
             params.put("orgid", "0");
         }
-        if (ObjectUtils.isNotNull(bo.getCreateNo())){
-            params.put("saleId", bo.getCreateNo());
+        if (ObjectUtils.isNotNull(bo.getCreateSysUserId())){
+            params.put("saleId", bo.getCreateSysUserId());
         }else {
             params.put("saleId", "0");
         }

+ 3 - 7
zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -263,11 +263,7 @@
         WHERE
         1 = 1 AND o.`status` IN (0,1)
         AND ( `o`.`order_type` != 4 )
-        AND (
-        isnull( `o`.`input_order_sn` )
-        OR (
-        NOT (
-        `o`.`input_order_sn` IN ( SELECT `top_old_order`.`input_order_sn` FROM `top_old_order` ))))
+        AND ( `o`.`org_sign` != 1 )
         <if test="businessFullName != null and businessFullName != ''">
             AND (
             SELECT
@@ -568,14 +564,14 @@
     </select>
 
     <select id="tenantMoneyTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"
-            resultType="BigDecimal">
+            resultType="java.math.BigDecimal">
         SELECT IFNULL(SUM(too.divide_company_money), 0)
         FROM v_top_order too
         WHERE too.divide_model = 1
           AND too.divide_status = 5
     </select>
     <select id="tenantSellerTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"
-            resultType="BigDecimal">
+            resultType="java.math.BigDecimal">
         SELECT IFNULL(SUM(too.divide_seller_money), 0)
         FROM v_top_order too
         WHERE too.divide_model = 2