Sfoglia il codice sorgente

fix bug

release_toaliyun_real
xiaohanzi 5 anni fa
parent
commit
4361d50c09
3 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  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. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java Vedi File

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


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


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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java Vedi File

@@ -71,7 +71,7 @@ public interface WxCouponChannelService {
*/ */
ResultData saveOrUpdate(WxCouponChannel record); 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); void updateStatusByCouponId(Long couponId,TenantEntity tenantEntity,int status);




+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java Vedi File

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


@Override @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()); WxMall mall = wxMallMapper.getByTenantId(tenantEntity.getTenantId());
if (mall.getSaleType().intValue() == 4 ) { 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(); WxCouponChannel record = new WxCouponChannel();
record.updateTenantInfo(tenantEntity); record.updateTenantInfo(tenantEntity);
record.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); record.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
record.setType(type);
record.setType(Integer.parseInt(type));
List<WxCouponChannelVo> list = wxCouponChannelMapper.findVoList(record); List<WxCouponChannelVo> list = wxCouponChannelMapper.findVoList(record);
if (null != list && list.size() > 0 ) { if (null != list && list.size() > 0 ) {
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_EXISTED,"该版本【拼团】、【砍价】线上只能发布一个。"); return new ResultData(ErrorCode.COUPON_CHANNEL_IS_EXISTED,"该版本【拼团】、【砍价】线上只能发布一个。");


Caricamento…
Annulla
Salva