winter 1 год назад
Родитель
Сommit
3d3108edd7
3 измененных файлов: 21 добавлений и 0 удалений
  1. +12
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +7
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 12
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -23,6 +23,8 @@ import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType;
import com.iformall.enums.EnumAppPlat;
import com.iformall.enums.EnumMerchantAdmin;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumShopSellStatus;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.*;
import io.swagger.annotations.ApiImplicitParam;
@@ -35,6 +37,8 @@ import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
@@ -267,6 +271,14 @@ public class WxMerchantController extends BaseController {
if (null == wxMerchant.getIsPrivate()) {
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode());
}
//如果是已售,则查询虚拟商户,并且店铺类型是商业的
if (wxMerchant.getIsPrivate()==EnumShopSellStatus.SELLED.getCode()) {
wxMerchant.setIsPrivate(EnumYesOrNo.YES.getCode());
List<Integer> rentShopTypeList = new ArrayList<Integer>();
rentShopTypeList.add(EnumRentShopType.SHOP.getCode());
rentShopTypeList.add(EnumRentShopType.POINT.getCode());
wxMerchant.setPrivateRentShopTypeList(rentShopTypeList);
}
return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant));
}



+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -502,4 +502,6 @@ public class WxMerchant extends TenantEntity {
public Date receiveDate;
@TableField(exist = false)
public Integer isAll;
@TableField(exist = false)
private List<Integer> privateRentShopTypeList;
}

+ 7
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -190,6 +190,13 @@
<if test=" null != searchKey and '' != searchKey ">
and (m.`name` like concat('%', #{searchKey},'%') or m.`link_phone` like concat('%', #{searchKey},'%'))
</if>
<if test=" null != privateRentShopTypeList and privateRentShopTypeList.size > 0">
and m.`create_shop_type` in
<foreach collection="privateRentShopTypeList" index="index" item="prstItem" open="(" separator="," close=")">
#{prstItem}
</foreach>
</if>
<if test=" null != adminTypes and adminTypes.size > 0">
and m.`is_admin` in


Загрузка…
Отмена
Сохранить