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

Merge branch 'release_real_202012' of https://git.malls.iformall.com/server/formallProject into release_real_202012

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
caf7b98193
3 измененных файлов: 7 добавлений и 7 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java Просмотреть файл

@@ -19,7 +19,7 @@ public class WxCouponChannelDto implements Serializable {

private Date showBeginTime;
private Integer type;
private String type;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java Просмотреть файл

@@ -71,7 +71,7 @@ public interface WxCouponChannelService {
*/
ResultData saveOrUpdate(WxCouponChannel record);

ResultData addBatch(Integer type,String[] ids, String[] channelId, TenantEntity tenantEntity, Date showBeginTime, Date beginTime, Date endTime);
ResultData addBatch(String type,String[] ids, String[] channelId, TenantEntity tenantEntity, Date showBeginTime, Date beginTime, Date endTime);

void updateStatusByCouponId(Long couponId,TenantEntity tenantEntity,int status);



+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Просмотреть файл

@@ -144,19 +144,19 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
}

@Override
public ResultData addBatch(Integer type,String[] ids, String[] channelId, TenantEntity tenantEntity, Date showBeginTime, Date beginTime, Date endTime) {
public ResultData addBatch(String type,String[] ids, String[] channelId, TenantEntity tenantEntity, Date showBeginTime, Date beginTime, Date endTime) {
//如果当前版本是推广版,则线上只能有一个拼团,一个砍价
WxMall mall = wxMallMapper.getByTenantId(tenantEntity.getTenantId());
if (mall.getSaleType().intValue() == 4 ) {
if (null != type && (type.intValue() == EnumCouponType.COUPON_PRESS.getCode().intValue()
|| type.intValue() == EnumCouponType.COUPON_GROUP.getCode().intValue())) {
if (null != type && (type.equals(String.valueOf(EnumCouponType.COUPON_PRESS.getCode().intValue()))
|| type.equals(String.valueOf(EnumCouponType.COUPON_GROUP.getCode().intValue())))) {
WxCouponChannel record = new WxCouponChannel();
record.updateTenantInfo(tenantEntity);
record.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
record.setType(type);
record.setType(Integer.parseInt(type));
List<WxCouponChannelVo> list = wxCouponChannelMapper.findVoList(record);
if (null != list && list.size() > 0 ) {
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_EXISTED,"该版本【拼团】、【砍价】线上只能发布一个。");
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_EXISTED.getCode(),"该版本【拼团】、【砍价】线上只能发布一个。");
}
}
}


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