Merge remote-tracking branch 'origin/div' into div

admin

2020-06-09 bc9b3881443190de6df4867a6b0a67bc472bab93

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java

@@ -256,7 +256,7 @@


                if (orderType != null && dateType != null && dateType == 4) {

                    if (orderType == 1) {

                        dateType = 6; // 返利订单有效

                        dateType = 6; // 返利订单有效的

                    } else {

                        dateType = 5; // 新版查询本月到账

                    }


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java

@@ -164,7 +164,7 @@
            @Param("type") Integer hbType, @Param("orderState") Integer orderState,

            @Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,  

            @Param("startTime") String startTime, @Param("endTime") String endTime,

            @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);

            @Param("listSource") List<Integer> listSource);



    /**

     * 统计各个订单类型 有效个数


 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -404,9 +404,6 @@
                co.co_source_type = #{item}

            </foreach>

        </if>

        <if test="notBackSuVip == true">

            <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>

        </if>

    </select>