소스 검색

fix

release_toaliyun_real
winter 1 년 전
부모
커밋
37ca73a594
2개의 변경된 파일11개의 추가작업 그리고 2개의 파일을 삭제
  1. +9
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxShop.java

+ 9
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java 파일 보기

@@ -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);
//查询自持的商业店铺


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxShop.java 파일 보기

@@ -238,5 +238,6 @@ public class WxShop extends TenantEntity {
private String shopUserTypeName;
@TableField(exist = false)
private String shopUserName;
@TableField(exist = false)
private Integer sortWay;
}

불러오는 중...
취소
저장