Commit f87b54ad by chongli

使用多张券功能开发

parent 6c91ccc0
...@@ -196,6 +196,21 @@ public class VoucherRuleDto { ...@@ -196,6 +196,21 @@ public class VoucherRuleDto {
*/ */
private int userLimit;//分享领取限制0:不限 2社员 private int userLimit;//分享领取限制0:不限 2社员
/**
* 是否可以和其他种类券一起用,0否 1是
*/
private int exclusive;
/**
* 一单可以使用的张数
*/
private int canUseAmount;
/**
* 每满多少减多少 列:如值为100,则 200<=订单金额<300可以使用两张
*/
private BigDecimal fullCutAmount;
public VoucherRuleDto(MultipleCourseConditionBean multipleCourseConditionBean) { public VoucherRuleDto(MultipleCourseConditionBean multipleCourseConditionBean) {
super(); super();
...@@ -511,4 +526,28 @@ public class VoucherRuleDto { ...@@ -511,4 +526,28 @@ public class VoucherRuleDto {
this.userLimit = userLimit; this.userLimit = userLimit;
} }
public int getExclusive() {
return exclusive;
}
public void setExclusive(int exclusive) {
this.exclusive = exclusive;
}
public int getCanUseAmount() {
return canUseAmount;
}
public void setCanUseAmount(int canUseAmount) {
this.canUseAmount = canUseAmount;
}
public BigDecimal getFullCutAmount() {
return fullCutAmount;
}
public void setFullCutAmount(BigDecimal fullCutAmount) {
this.fullCutAmount = fullCutAmount;
}
} }
...@@ -478,6 +478,8 @@ $(function(){ ...@@ -478,6 +478,8 @@ $(function(){
<@form.textInput path="dto.quantity" attributes="class=\"input-medium\"" label="单用户发放张数" required = true type="number" /> <@form.textInput path="dto.quantity" attributes="class=\"input-medium\"" label="单用户发放张数" required = true type="number" />
<@form.textInput path="dto.quantityCheck" attributes="class=\"input-medium\"" label="发放张数确认" required = true type="number" /> <@form.textInput path="dto.quantityCheck" attributes="class=\"input-medium\"" label="发放张数确认" required = true type="number" />
<@form.textInput path="dto.canUseAmount" attributes="class=\"input-medium\"" label="每单限使用量" required = true type="number" />
<@form.textInput path="dto.fullCutAmount" attributes="class=\"input-medium\"" label="满减" required = true />
<div class="long_content_div control-group" id="voucherRuleTypeValue1show"> <div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">用户本人使用</label> <label class="control-label" for="type">用户本人使用</label>
<div class="controls"> <div class="controls">
...@@ -497,7 +499,7 @@ $(function(){ ...@@ -497,7 +499,7 @@ $(function(){
</div> </div>
</div> </div>
<div class="long_content_div control-group" id="userGetLimit" style="display:none"> <div class="long_content_div control-group" id="userGetLimit" style="display:none">
<label class="control-label" for="type">限会员可领</label> <label class="control-label" for="type">限会员可领</label>
<div class="controls"> <div class="controls">
...@@ -508,6 +510,16 @@ $(function(){ ...@@ -508,6 +510,16 @@ $(function(){
</div> </div>
</div> </div>
<div class="long_content_div control-group" id="canShareDiv">
<label class="control-label" for="type">互斥券</label>
<div class="controls">
<input style="margin-bottom: 5px;" type="radio" id="notCanShareInput" name="exclusive" value="1" checked>
<span style="padding-right: 20px;">是</span>
<input style="margin-bottom: 5px;" type="radio" id="canShareInput" name="exclusive" value="0" >
<span style="padding-right: 20px;">否</span>
</div>
</div>
<#if dto.voucherRuleType == 1> <#if dto.voucherRuleType == 1>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show"> <div class="long_content_div control-group" id="voucherRuleTypeValue1show">
......
...@@ -523,6 +523,24 @@ function getResourceList(page){ ...@@ -523,6 +523,24 @@ function getResourceList(page){
<td style="text-align:left">${dto.quantity!}</td> <td style="text-align:left">${dto.quantity!}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align:left">每单限使用量</td>
<td style="text-align:left">${dto.canUseAmount!}</td>
</tr>
<tr>
<td style="text-align:left">满减</td>
<td style="text-align:left">${dto.fullCutAmount!}</td>
</tr>
<tr>
<td style="text-align:left">互斥券</td>
<td style="text-align:left">
<#if dto.exclusive == 1>
<#elseif dto.exclusive == 0>
</#if>
</td>
</tr>
<tr>
<td style="text-align:left">本人使用</td> <td style="text-align:left">本人使用</td>
<td style="text-align:left"> <td style="text-align:left">
<#if dto.onlyMe == 1> <#if dto.onlyMe == 1>
......
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 sign in to comment