|
|
|
@@ -15,6 +15,7 @@ import com.iformall.domain.po.WxShopUsersPerson; |
|
|
|
import com.iformall.domain.po.WxShopUsers; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumCUserBaseInfoSex; |
|
|
|
import com.iformall.enums.EnumRentShopType; |
|
|
|
@@ -25,6 +26,8 @@ import com.iformall.enums.EnumShopUsersStatus; |
|
|
|
import com.iformall.enums.EnumShopUsersType; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
import com.lowagie.text.pdf.BaseField; |
|
|
|
|
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
@@ -124,7 +127,12 @@ public class WxShopController extends BaseController { |
|
|
|
wxShop = new WxShop(); |
|
|
|
} |
|
|
|
wxShop.updateTenantInfo(getTenantInfo()); |
|
|
|
wxShop.setSortColumn("shop_number asc"); |
|
|
|
if (null != wxShop.getSortWay() && 1 == wxShop.getSortWay()) { |
|
|
|
wxShop.setSortColumns(SortField.CreateDate_DESC); |
|
|
|
}else { |
|
|
|
wxShop.setSortColumn("shop_number asc"); |
|
|
|
} |
|
|
|
|
|
|
|
//wxShop.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); |
|
|
|
setDataRule(wxShop); |
|
|
|
//查询自持的商业店铺 |
|
|
|
|