bug修改

huliguo

2 天以前 037afe2b2fe08cfcc768e543fc15960e56e31b76

bug修改

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/PageShopMgtGoodsVO.java

@@ -78,6 +78,7 @@
    @ApiModelProperty("修改价格权限（0=关，1=开）")
    private Integer modifyPricePermission;

    @ApiModelProperty(hidden = true)
    private Long shopId;

}

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -530,7 +530,7 @@
            tg.goods_id,
            tg.goods_name,
            tg.goods_introduction,
            tg.goods_class_id,
            tg.goods_class_id goodsClass,
            tg.goods_tags,
            tgf.file_url goodsPicture,
            CASE tg.goods_type
@@ -572,7 +572,7 @@
        </if>
        <if test="dto.shopIds != null and dto.shopIds.size() > 0">
            AND tsg.shop_id IN
            <foreach collection="param.shopIds" item="item" open="(" separator="," close=")">
            <foreach collection="dto.shopIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java

@@ -29,6 +29,22 @@
    @ApiModelProperty(value = "线下订单数")
    private Integer offlineTotal;

    @ApiModelProperty(value = "美团订单数")
    private Integer meituan;
    @ApiModelProperty(value = "美团订单金额")
    private BigDecimal meituanAmount;

    @ApiModelProperty(value = "抖音订单数")
    private Integer douyin;
    @ApiModelProperty(value = "抖音订单金额")
    private BigDecimal douyinAmount;

    @ApiModelProperty(value = "快手订单数")
    private Integer kuaishou;
    @ApiModelProperty(value = "快手订单金额")
    private BigDecimal kuaishouAmount;


    @ApiModelProperty(value = "活动订单数")
    private Integer activityTotal;


 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -1193,8 +1193,14 @@
        IFNULL(SUM(CASE WHEN order_from in (1,5,6,7) THEN 1 ELSE 0 END),0) onlineTotal,
        IFNULL(SUM(CASE WHEN order_from = 3 THEN 1 ELSE 0 END),0) offlineTotal,
        IFNULL(SUM(CASE WHEN order_from = 2 THEN 1 ELSE 0 END),0) activityTotal,
        IFNULL(SUM(CASE WHEN order_from = 5 THEN 1 ELSE 0 END),0) meituan,
        IFNULL(SUM(CASE WHEN order_from = 5 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) meituanAmount,
        IFNULL(SUM(CASE WHEN order_from = 6 THEN 1 ELSE 0 END),0) douyin,
        IFNULL(SUM(CASE WHEN order_from = 6 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) douyinAmount,
        IFNULL(SUM(CASE WHEN order_from = 7 THEN 1 ELSE 0 END),0) kuaishou,
        IFNULL(SUM(CASE WHEN order_from = 7 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) kuaishouAmount,
        IFNULL(SUM(CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END),0) orderMoney,
        IFNULL(SUM(CASE WHEN order_from = in (1,5,6,7) THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) onlineMoney,
        IFNULL(SUM(CASE WHEN order_from in (1,5,6,7) THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) onlineMoney,
        IFNULL(SUM(CASE WHEN order_from = 3 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) offlineMoney,
        IFNULL(SUM(CASE WHEN order_from = 2 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) activityMoney
        FROM t_order WHERE del_flag = 0 AND order_status = 3
@@ -2212,7 +2218,7 @@
        WHEN 7 THEN '快手'
        END orderFrom,
        tog.goods_name goodsName,
        toc.order_money orderMoney,
        IFNULL(CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END,0) orderMoney,
        toc.validity_time validityTime,
        CASE WHEN toc.order_status = 3 THEN toc.shop_id ELSE NULL END shopId,
        toc.use_time verifyTime
@@ -2251,13 +2257,12 @@
        IFNULL(SUM(CASE WHEN order_from = 6 THEN 1 ELSE 0 END), 0) AS douyin,
        IFNULL(SUM(CASE WHEN order_from = 7 THEN 1 ELSE 0 END), 0) AS kuaishou,
        IFNULL(SUM(CASE WHEN order_from = 8 THEN 1 ELSE 0 END), 0) AS xiaoeyun,

        -- 订单金额统计（取order_money）
        IFNULL(SUM(order_money), 0) AS orderTotalMoney,
        IFNULL(SUM(CASE WHEN order_from = 5 THEN order_money ELSE 0 END), 0) AS meituanMoney,
        IFNULL(SUM(CASE WHEN order_from = 6 THEN order_money ELSE 0 END), 0) AS douyinMoney,
        IFNULL(SUM(CASE WHEN order_from = 7 THEN order_money ELSE 0 END), 0) AS kuaishouMoney,
        IFNULL(SUM(CASE WHEN order_from = 8 THEN order_money ELSE 0 END), 0) AS xiaoeyunMoney
        IFNULL(SUM(CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END),0)  AS orderTotalMoney,
        IFNULL(SUM(CASE WHEN order_from = 5 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) meituanMoney,
        IFNULL(SUM(CASE WHEN order_from = 6 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) douyinMoney,
        IFNULL(SUM(CASE WHEN order_from = 7 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) kuaishouMoney,
        IFNULL(SUM(CASE WHEN order_from = 8 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) ELSE 0 END),0) xiaoeyunMoney
        FROM
        t_order
        WHERE

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml

@@ -323,13 +323,28 @@
            AND ts.shop_type = #{param.shopType}
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.signStartTime!=null and param.signStartTime!=''">
            AND Date(ts.sign_time) &gt;= #{param.signStartTime}
@@ -514,13 +529,28 @@
            AND ts.shop_name LIKE CONCAT('%',#{param.shopName},'%')
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.belongUserId!=null and param.belongUserId!=''">
            AND ts.belong_user_id = #{param.belongUserId}
@@ -722,13 +752,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -753,13 +798,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
    </select>

@@ -777,13 +837,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -807,13 +882,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -837,13 +927,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -869,13 +974,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -899,13 +1019,28 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
            AND (
            ts.shop_province_code = #{param.shopProvinceCode}
            OR ts.shop_province_code LIKE CONCAT(#{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode}, ';%')
            OR ts.shop_province_code LIKE CONCAT('%;', #{param.shopProvinceCode})
            )
        </if>
        <if test="param.shopCityCode!=null and param.shopCityCode!=''">
            AND ts.shop_city_code = #{param.shopCityCode}
            AND (
            ts.shop_city_code = #{param.shopCityCode}
            OR ts.shop_city_code LIKE CONCAT(#{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode}, ';%')
            OR ts.shop_city_code LIKE CONCAT('%;', #{param.shopCityCode})
            )
        </if>
        <if test="param.shopAreaCode!=null and param.shopAreaCode!=''">
            AND ts.shop_area_code = #{param.shopAreaCode}
            AND (
            ts.shop_area_code = #{param.shopAreaCode}
            OR ts.shop_area_code LIKE CONCAT(#{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode}, ';%')
            OR ts.shop_area_code LIKE CONCAT('%;', #{param.shopAreaCode})
            )
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(ts.create_time) &gt;= #{param.startDate}
@@ -1064,10 +1199,16 @@
        SELECT shop_id
        FROM t_shop
        WHERE del_flag = 0
        AND shop_city_code IN
        <foreach item="id" collection="cityCodes" open="(" separator="," close=")">
            #{id}
        </foreach>
        <if test="cityCodes != null and cityCodes.size() > 0">
            AND (
            <foreach item="code" collection="cityCodes" separator=" OR ">
                ts.shop_city_code = #{code}
                OR ts.shop_city_code LIKE CONCAT(#{code}, ';%')
                OR ts.shop_city_code LIKE CONCAT('%;', #{code}, ';%')
                OR ts.shop_city_code LIKE CONCAT('%;', #{code})
            </foreach>
            )
        </if>
    </select>


@@ -1075,10 +1216,16 @@
    <select id="listShopByCityCode" resultMap="ShopResult">
        <include refid="selectShopVo"/>
        WHERE del_flag = 0 and shop_status = 1
        AND shop_city_code  IN
        <foreach item="id" collection="cityCodes" open="(" separator="," close=")">
            #{id}
        </foreach>
        <if test="cityCodes != null and cityCodes.size() > 0">
            AND (
            <foreach item="code" collection="cityCodes" separator=" OR ">
                ts.shop_city_code = #{code}
                OR ts.shop_city_code LIKE CONCAT(#{code}, ';%')
                OR ts.shop_city_code LIKE CONCAT('%;', #{code}, ';%')
                OR ts.shop_city_code LIKE CONCAT('%;', #{code})
            </foreach>
            )
        </if>
    </select>



 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java

@@ -104,7 +104,7 @@
    public R deleteOneClinkSyncing(Integer syncingId) {
        //删除
        OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
            return R.ok();
        }
        oneClinkSyncing.setDelFlag(1);
@@ -118,7 +118,7 @@
    public R executeOneClinkSyncing(Integer syncingId) {
        //根据oneClinkSyncing,修改门店信息
        OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
        if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
            return R.fail("该一键同步不存在");
        }
        if (oneClinkSyncing.getShopIds() == null || oneClinkSyncing.getShopIds().trim().isEmpty()) {

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/OneClinkSyncingMapper.xml

@@ -23,7 +23,7 @@
        <if test="dto.syncingStartTime!=null and dto.syncingStartTime != ''">
            AND  syncing_time &gt;= #{dto.syncingStartTime}
        </if>
        <if test="dto.createEndTime!=null and dto.createEndTime != ''">
        <if test="dto.syncingStartTime!=null and dto.syncingStartTime != ''">
            AND syncing_time &lt;= #{dto.syncingEndTime}
        </if>
    </select>