新增加关闭进件功能

Pu Zhibing

2026-01-12 71e96f0e56fc1d6d1c21c6bd571979ddd3d93674

新增加关闭进件功能

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java

@@ -329,6 +329,12 @@
    private String ksPoiId;

    /**
     * 签约区域
     */
    @TableField("sign_code_list")
    private String signCodeList;

    /**
     *  该字段用于用户登录获取默认门店
     */
    @TableField(exist = false)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -1,6 +1,7 @@
package com.ruoyi.shop.controller.management;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
@@ -10,6 +11,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.BankBranchCode;
import com.ruoyi.shop.domain.pojo.shop.ShopAuthenticationHftx;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
@@ -67,6 +69,9 @@
    private BankBranchCodeService bankBranchCodeService;
    @Resource
    private RemoteUserService sysUserService;

    @Resource
    private ShopAuthenticationHftxService shopAuthenticationHftxService;



@@ -648,4 +653,20 @@
        return shopService.changeShopType(shopId);
    }


    @RequestMapping(value = "/closeShopHFTX", method = RequestMethod.POST)
    @ApiOperation(value = "关闭进件（汇付天下）")
    public R<Void> closeShopHFTX(@Validated @RequestBody CloseHFDto dto){
        Shop shop = shopService.getById(dto.getShopId());
        shop.setAuthFlag(0);
        shopService.updateById(shop);
        ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new LambdaQueryWrapper<ShopAuthenticationHftx>().eq(ShopAuthenticationHftx::getShopId, dto.getShopId())
                .eq(ShopAuthenticationHftx::getIsDelete, 0).eq(ShopAuthenticationHftx::getAuditStatus, "Y"));
        if(null != shopAuthenticationHftx){
            shopAuthenticationHftx.setIsDelete(1);
            shopAuthenticationHftxService.updateById(shopAuthenticationHftx);
        }
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/CloseHFDto.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.shop.domain.dto;

import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * @ClassName Mgt
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/19 10:57
 * @Version 1.0
 */
@Data
public class CloseHFDto extends MgtBaseDto {
    /**
     * 商户id
     */
    @ApiModelProperty(value = "商户id")
    private Long shopId;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java

@@ -1,6 +1,7 @@
package com.ruoyi.shop.domain.dto;


import com.alibaba.fastjson.JSONArray;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -156,4 +157,6 @@
    private String dyPoiId;
    @ApiModelProperty("快手id")
    private String ksPoiId;

    private JSONArray signCodeList;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java

@@ -1,5 +1,6 @@
package com.ruoyi.shop.domain.vo;

import com.alibaba.fastjson2.JSONArray;
import com.ruoyi.shop.domain.pojo.shop.ShopCertificate;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -166,6 +167,8 @@
    @ApiModelProperty("快手门店id")
    private String ksPoiId;

    private JSONArray signCodeList;



}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -280,6 +280,9 @@
            newShop = true;
        }
        BeanUtils.copyProperties(mgtEditShopDto,shop);
        if(null != mgtEditShopDto.getSignCodeList()){
            shop.setSignCodeList(mgtEditShopDto.getSignCodeList().toJSONString());
        }
        String shopDetail = shop.getShopDetail();
        if(StringUtils.isNotBlank(shopDetail)){
            byte[] decodedBytes = Base64.getDecoder().decode(shopDetail);
@@ -703,6 +706,9 @@
        //商户证书
        List<ShopCertificate> shopCertificateList = shopCertificateService.listShopCertificateByShopId(shopId);
        mgtShopInfoVo.setShopCertificateList(shopCertificateList);
        if(StringUtils.isNotEmpty(shop.getSignCodeList())){
            mgtShopInfoVo.setSignCodeList(JSON.parseArray(shop.getSignCodeList()));
        }
        return mgtShopInfoVo;
    }


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

@@ -323,13 +323,13 @@
            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 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 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 like CONCAT('%', #{param.shopAreaCode}, '%')
        </if>
        <if test="param.signStartTime!=null and param.signStartTime!=''">
            AND Date(ts.sign_time) &gt;= #{param.signStartTime}
@@ -338,13 +338,13 @@
            AND Date(ts.sign_time) &lt;= #{param.signEndTime}
        </if>
        <if test="param.signProvinceCode!=null and param.signProvinceCode!=''">
            AND ts.sign_province_code = #{param.signProvinceCode}
            AND ts.sign_province_code like CONCAT('%', #{param.signProvinceCode}, '%')
        </if>
        <if test="param.signCityCode!=null and param.signCityCode!=''">
            AND ts.sign_city_code = #{param.signCityCode}
            AND ts.sign_city_code like CONCAT('%', #{param.signCityCode}, '%')
        </if>
        <if test="param.signAreaCode!=null and param.signAreaCode!=''">
            AND ts.sign_area_code = #{param.signAreaCode}
            AND ts.sign_area_code like CONCAT('%', #{param.signAreaCode}, '%')
        </if>
        <if test="param.shopStatus!=null and param.shopStatus==0">
            AND ts.frozen_flag = 1
@@ -514,28 +514,13 @@
            AND ts.shop_name LIKE CONCAT('%',#{param.shopName},'%')
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND ts.shop_area_code LIKE CONCAT('%', #{param.shopAreaCode}, '%')
        </if>
        <if test="param.belongUserId!=null and param.belongUserId!=''">
            AND ts.belong_user_id = #{param.belongUserId}
@@ -737,28 +722,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -783,28 +753,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND ts.shop_area_code LIKE CONCAT('%', #{param.shopAreaCode}, '%')
        </if>
    </select>

@@ -822,28 +777,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -867,28 +807,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -912,28 +837,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -959,28 +869,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -1004,28 +899,13 @@
            </foreach>
        </if>
        <if test="param.shopProvinceCode!=null and 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})
            )
            AND ts.shop_province_code LIKE CONCAT('%', #{param.shopProvinceCode}, '%')
        </if>
        <if test="param.shopCityCode!=null and 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})
            )
            AND ts.shop_city_code LIKE CONCAT('%', #{param.shopCityCode}, '%')
        </if>
        <if test="param.shopAreaCode!=null and 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})
            )
            AND 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}
@@ -1065,13 +945,13 @@
            AND Date(ts.sign_time) &lt;= #{param.signEndTime}
        </if>
        <if test="param.signProvinceCode!=null and param.signProvinceCode!=''">
            AND ts.sign_province_code = REGEXP CONCAT('(^|;)' ,#{param.signProvinceCode}, '(;|$)')
            AND ts.sign_province_code LIKE CONCAT('%' ,#{param.signProvinceCode}, '%')
        </if>
        <if test="param.signCityCode!=null and param.signCityCode!=''">
            AND ts.sign_city_code = REGEXP CONCAT('(^|;)' ,#{param.signCityCode}, '(;|$)')
            AND ts.sign_city_code LIKE CONCAT('%' ,#{param.signCityCode}, '%')
        </if>
        <if test="param.signAreaCode!=null and param.signAreaCode!=''">
            AND ts.sign_area_code = REGEXP CONCAT('(^|;)' ,#{param.signAreaCode}, '(;|$)')
            AND ts.sign_area_code LIKE CONCAT('%' ,#{param.signAreaCode}, '%')
        </if>
        <if test="param.recommendPerson!=null and param.recommendPerson!=''">
            AND ts.recommend_person = #{param.recommendPerson}
@@ -1196,10 +1076,7 @@
        <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})
                ts.shop_city_code LIKE CONCAT('%', #{code}, '%')
            </foreach>
            )
        </if>
@@ -1213,10 +1090,7 @@
        <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})
                ts.shop_city_code LIKE CONCAT('%', #{code}, '%')
            </foreach>
            )
        </if>
@@ -1286,10 +1160,7 @@
        <if test="list != null and list.size() > 0">
            AND (
            <foreach collection="list" item="code" separator=" OR ">
                sign_area_code = #{code}
                OR sign_area_code LIKE CONCAT(#{code}, ';%')
                OR sign_area_code LIKE CONCAT('%;', #{code}, ';%')
                OR sign_area_code LIKE CONCAT('%;', #{code})
                sign_area_code LIKE CONCAT('%', #{code}, '%')
            </foreach>
            )
        </if>