Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

Pu Zhibing

2024-09-27 1ca6b09fe9acc896f3eb62876969b28e72f77535

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java

@@ -88,7 +88,7 @@
            if(collect.isEmpty()){
                collect.add(-1L);
            }
            wrapper.in("id",collect);
            wrapper.in("app_user_id",collect);
        }
        if (dto.getStatus()!=null){
            wrapper.eq("status",dto.getStatus());

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TExchangeOrderMapper.xml

@@ -56,9 +56,10 @@
            )
        </if>
        <if test="startTime1 != null and startTime1!=''">
            and (t1.create_time between #{startTime1} and #{startTime2}
            and (t1.create_time between #{startTime1} and #{startTime2})
        </if>
        AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        order by t1.create_time desc
    </select>

</mapper>

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml

@@ -251,7 +251,7 @@
            )
        </if>
        <if test="startTime1 != null and startTime1!=''">
            and (t1.create_time between #{startTime1} and #{startTime2}
            and (t1.create_time between #{startTime1} and #{startTime2})
        </if>
        and t1.payment_status = 2
        AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}

 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TGoodsMapper.xml

@@ -46,7 +46,7 @@
                AND  inventory = 0
            </if>
            <if test="req.otherState != null and req.otherState ==3">
                AND  status = #{req.status}
                AND  status = 3
            </if>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>