Просмотр исходного кода

b端商户发卷接口排序别名

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
e08acfbfb4
8 измененных файлов: 43 добавлений и 3 удалений
  1. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  2. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  3. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
  4. +5
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  5. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  6. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  8. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

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

@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +67,11 @@ public class WxCouponChannelController extends BaseController {
} }
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
}

final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


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

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,9 @@ public class WxCouponController extends BaseController {
if(null == wxCoupon.getSourceType()){ if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
} }
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
}
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
} }


@@ -91,6 +95,9 @@ public class WxCouponController extends BaseController {
EnumCouponType.COUPON_PRESS.getCode()}; EnumCouponType.COUPON_PRESS.getCode()};


wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setTypes(Arrays.asList(typeArray));
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
}
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
} }




+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java Просмотреть файл

@@ -54,7 +54,11 @@ public class MemCouponController extends BaseController {
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode());
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
}
final PageInfo<WxCouponChannelVo> page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 5
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -19,6 +19,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +61,10 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setMerchantId(getUser().getMerchantId()); wxCouponChannel.setMerchantId(getUser().getMerchantId());
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
}
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +67,11 @@ public class WxCouponController extends BaseController {
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
} }
wxCoupon.setMerchantId(getUser().getMerchantId()); wxCoupon.setMerchantId(getUser().getMerchantId());

if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
}

return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
} }


@@ -88,6 +94,10 @@ public class WxCouponController extends BaseController {
EnumCouponType.COUPON_PRESS.getCode()}; EnumCouponType.COUPON_PRESS.getCode()};


wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setTypes(Arrays.asList(typeArray));
wxCoupon.setMerchantId(getUser().getMerchantId());
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
}
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
} }




+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.Map; import java.util.Map;


import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +56,11 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());


wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn());
}
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page); filterTimed(wxCouponChannel, page);
return new ResultData(page); return new ResultData(page);


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

@@ -137,6 +137,9 @@ public class BaseEntity implements Serializable {
CId_ASC("c.`id` ASC"), CId_ASC("c.`id` ASC"),
CId_DESC("c.`id` DESC"), CId_DESC("c.`id` DESC"),


CCId_ASC("cc.`id` ASC"),
CCId_DESC("cc.`id` DESC"),

CreateDate_ASC("`create_date` ASC"), CreateDate_ASC("`create_date` ASC"),
CreateDate_DESC("`create_date` DESC"), CreateDate_DESC("`create_date` DESC"),




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

@@ -152,7 +152,7 @@


<sql id="CouponChannelVoColumns"> <sql id="CouponChannelVoColumns">
<include refid="allColumns" />, <include refid="allColumns" />,
c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,
c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions, c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type
</sql> </sql>


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