he2802 2 lat temu
rodzic
commit
5fa744aaed

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1586,7 +1586,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 queryBo1.setTenantId(tenantVo.getTenantId());
                 //订单总待付分成
                 BigDecimal totalPayMoney = new BigDecimal(0);
-                List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthFinishList(queryBo1);
+                List<TopDivideOrderVo> list1 = iTopDivideOrderService.getMonthCreditList(queryBo1);
                 for(TopDivideOrderVo vo : list1){
                     totalPayMoney = totalPayMoney.add(vo.getBrokerage());
                     TopDivideOrderAddBo addBo = new TopDivideOrderAddBo();

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/mapper/TopDivideOrderMapper.java

@@ -26,6 +26,8 @@ public interface TopDivideOrderMapper extends BaseMapper<TopDivideOrder> {
 
     List<TopDivideOrderVo> getMonthFinishList(TopDivideOrderQueryBo bo);
 
+    List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
+
     List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
     List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/ITopDivideOrderService.java

@@ -59,6 +59,8 @@ public interface ITopDivideOrderService extends IService<TopDivideOrder> {
 
 	List<TopDivideOrderVo> getMonthFinishList(TopDivideOrderQueryBo bo);
 
+	List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo);
+
 	List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo);
 
 	List<TopDivideOrderVo> getMonthRefundList(TopDivideOrderQueryBo bo);

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopDivideOrderServiceImpl.java

@@ -127,6 +127,11 @@ public class TopDivideOrderServiceImpl extends ServiceImpl<TopDivideOrderMapper,
         return baseMapper.getMonthFinishList(bo);
     }
 
+    @Override
+    public List<TopDivideOrderVo> getMonthCreditList(TopDivideOrderQueryBo bo) {
+        return baseMapper.getMonthCreditList(bo);
+    }
+
     @Override
     public List<String> getMonthFinishAllTenant(TopDivideOrderQueryBo bo) {
         return baseMapper.getMonthFinishAllTenant(bo);

+ 27 - 2
zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -106,6 +106,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getMonthCreditList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
+        SELECT
+        v.order_sn,
+        v.divide_company_money,
+        v.divide_seller_money,
+        v.tenant_id,
+        v.create_no,
+        v.create_username,
+        v.brokerage
+        FROM
+        v_top_order v
+        WHERE
+        1 = 1
+        <if test="accomplishStartTime != null and accomplishStartTime != ''">
+            AND v.credit_time BETWEEN #{accomplishStartTime} and #{accomplishEndTime}
+        </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND v.tenant_id = #{tenantId}
+        </if>
+        <if test="createNo != null and createNo != ''">
+            AND v.create_no = #{createNo}
+        </if>
+    </select>
+
     <select id="getMonthRefundList" parameterType="com.zhongzheng.modules.top.financial.bo.TopDivideOrderQueryBo"  resultType="com.zhongzheng.modules.top.financial.vo.TopDivideOrderVo">
         SELECT
         tor.order_sn,
@@ -141,11 +165,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         top_old_order too
         WHERE
         too.status=1
+          AND too.check_status = 1
         <if test="buyStartTime != null and buyStartTime != ''">
-            AND too.buy_time <![CDATA[ >= ]]> #{buyStartTime}
+            AND too.check_time <![CDATA[ >= ]]> #{buyStartTime}
         </if>
         <if test="buyEndTime != null and buyEndTime != ''">
-            AND too.buy_time <![CDATA[ <= ]]> #{buyEndTime}
+            AND too.check_time <![CDATA[ <= ]]> #{buyEndTime}
         </if>
         <if test="tenantId != null and tenantId != ''">
             AND too.tenant_id = #{tenantId}

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

@@ -263,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             top_old_order too
                 LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
                 LEFT JOIN top_order_rec_note rn ON too.tenant_id = rn.tenant_id and too.order_sn = rn.order_sn
-        where too.status=1
+        where too.check_status=1
         <if test="startTime != null and startTime != ''">
             AND too.buy_time <![CDATA[ >= ]]> #{startTime}
         </if>