|
|
|
@@ -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)); |
|
|
|
} |
|
|
|
|
|
|
|
|