no

DESKTOP-71BH0QO\L、ming

2021-04-17 f26afbade349b6e230a298b9029657dec6ef56f6

no

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopStoreDTO.java

@@ -15,9 +15,9 @@
    @ApiModelProperty(value = "商家姓名")
    private String contacts;
    @ApiModelProperty(value = "商家账号")
    private String name;
    @ApiModelProperty(value = "店铺名称")
    private String account;
    @ApiModelProperty(value = "店铺名称")
    private String name;
    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）")
    private Integer deliveryType;
    @ApiModelProperty(value = "店铺状态（1.启用  2.禁用）")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java

@@ -33,8 +33,7 @@
    @PostMapping("addvillage")
    @Transactional(rollbackFor = Exception.class)
    public R addVillage(@Valid  @RequestBody ComMngVillageVO comMngVillageVO) {
        R r = comMngVillageService.addComActVillage(comMngVillageVO);
        return R.ok(r);
        return comMngVillageService.addComActVillage(comMngVillageVO);
    }

    /**
@@ -44,8 +43,7 @@
     */
    @PostMapping("pagevillage")
    public R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO) {
        R r = comMngVillageService.pageComActVillage(pageComMngVillageDTO);
        return R.ok(r);
        return comMngVillageService.pageComActVillage(pageComMngVillageDTO);
    }

    /**
@@ -55,8 +53,7 @@
     */
    @PostMapping("listvillage")
    public R listVillage(@RequestBody ComMngVillageVO comMngVillageVO) {
        R r = comMngVillageService.listComActVillage(comMngVillageVO);
        return R.ok(r);
        return  comMngVillageService.listComActVillage(comMngVillageVO);
    }

    /**
@@ -67,8 +64,7 @@
    @PostMapping("deletevillage")
    @Transactional(rollbackFor = Exception.class)
    public R delectVillage(@RequestBody List<Long> Ids) {
        R r = comMngVillageService.delecComActVillage(Ids);
        return R.ok(r);
        return comMngVillageService.delecComActVillage(Ids);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java

@@ -18,7 +18,27 @@
@Mapper
public interface ComShopStoreDAO extends BaseMapper<ComShopStoreDO> {

    @Select("select id,`name`,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail from com_shop_store")
    @Select("<script>" +
            "select id,`name`,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail from com_shop_store c" +
            " <where>" +
            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +
            "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
            " </if> " +
            "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != &quot;&quot;'>" +
            "and c.account = #{pageComShopStoreDTO.account} \n" +
            " </if> " +
            "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != &quot;&quot;'>" +
            "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" +
            " </if> " +
            "<if test='pageComShopStoreDTO.deliveryType != null'>" +
            "and c.delivery_type =#{pageComShopStoreDTO.deliveryType}\n" +
            " </if> " +
            "<if test='pageComShopStoreDTO.status != null'>" +
            "and c.status =#{pageComShopStoreDTO.status} \n" +
            " </if> " +
            " </where>" +
            " order by c.create_at desc"+
            "</script>")
    IPage<ComShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);

}