记得上下班打卡 | git大法好,push需谨慎

Commit 5e48d024 authored by zz's avatar zz

Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 阶梯退票_羊毛券_合并分支

parents f9e504be 3a18b35a
...@@ -329,16 +329,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -329,16 +329,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
skuInfoVo.getCouType(), skuInfoVo.getValFace(), skuInfoVo.getValidity(), skuInfoVo.getIsTrueName(), skuInfoVo.getCouType(), skuInfoVo.getValFace(), skuInfoVo.getValidity(), skuInfoVo.getIsTrueName(),
skuInfoVo.getEffectAt(), skuInfoVo.getExpireAt(), createdBy, createdAt skuInfoVo.getEffectAt(), skuInfoVo.getExpireAt(), createdBy, createdAt
}); });
String busiName = "%s系列 "; String busiName = "%s";
switch (skuInfoVo.getUseScope()) {// 适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演] switch (skuInfoVo.getUseScope()) {// 适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]
case 101:// 音乐节 case 101:// 音乐节
busiName = String.format(busiName, "音乐节"); busiName = String.format(busiName, "草莓、M_DSK、五百里音乐节");// 按杨要求文案'音乐节'改'草莓、M_DSK、五百里音乐节'
break; break;
case 102:// 小型演出(LiveHouse演出) case 102:// 小型演出(LiveHouse演出)
busiName = String.format(busiName, "小型演出(LiveHouse演出)"); busiName = String.format(busiName, "小型演出(LiveHouse演出)系列");
break; break;
case 103:// 巡演 case 103:// 巡演
busiName = String.format(busiName, "巡演"); busiName = String.format(busiName, "巡演 系列");
break; break;
} }
initCandyCouponRuleObjs.add(new Object[]{IDGenerator.nextTimeId2(), skuId, skuInfoVo.getUseScope(), busiName, ""}); initCandyCouponRuleObjs.add(new Object[]{IDGenerator.nextTimeId2(), skuId, skuInfoVo.getUseScope(), busiName, ""});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment