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

Commit c8499c6d authored by 张国柄's avatar 张国柄

~admin:我的券包:创建发放券开放全体用户-回归测试;

parent 612f4292
...@@ -315,7 +315,7 @@ public class CandyMgtCouponAdminController extends BaseController { ...@@ -315,7 +315,7 @@ public class CandyMgtCouponAdminController extends BaseController {
break; break;
case 3:// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户) case 3:// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户)
case 1: case 1:
if (!Arrays.asList(1, 2).contains(buildParam.getEventType())) { if (!Arrays.asList(1, 2, 10).contains(buildParam.getEventType())) {
return AjaxResult.warn("发送类型无效"); return AjaxResult.warn("发送类型无效");
} }
if (buildParam.getEventType() == 2) {// 指定用户手机号 if (buildParam.getEventType() == 2) {// 指定用户手机号
......
...@@ -204,8 +204,8 @@ ...@@ -204,8 +204,8 @@
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<span class="labelName">发送类型:</span> <span class="labelName">发送类型:</span>
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>--> <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType" checked><span>会员</span> <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span> <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div> </div>
</div> </div>
......
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<span class="labelName">发送类型:</span> <span class="labelName">发送类型:</span>
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>--> <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType" checked><span>会员</span> <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span> <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div> </div>
</div> </div>
......
...@@ -207,8 +207,8 @@ ...@@ -207,8 +207,8 @@
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<span class="labelName">发送类型:</span> <span class="labelName">发送类型:</span>
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>--> <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType" checked><span>会员</span> <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span> <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div> </div>
</div> </div>
......
...@@ -197,8 +197,8 @@ ...@@ -197,8 +197,8 @@
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<span class="labelName">发送类型:</span> <span class="labelName">发送类型:</span>
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>--> <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType" checked><span>会员</span> <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span> <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div> </div>
</div> </div>
......
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