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

Skip to content

L
liquidnet-bus-v1
Commit cb2585cc authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

积分admin

parent 339a72c1
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html
View file @ cb2585cc
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
case 2: case 2:
receivingStatus = "已发放"; receivingStatus = "已发放";
break; break;
case 2: case 3:
receivingStatus = "无需发放"; receivingStatus = "无需发放";
break; break;
} }
...@@ -141,7 +141,9 @@ ...@@ -141,7 +141,9 @@
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
if (row.receivingStatus == 1) {
actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发放</a> '); actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发放</a> ');
}
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @ cb2585cc
...@@ -61,7 +61,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA ...@@ -61,7 +61,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
List<SweetIntegralActivityPrizeFormParam> prizeList = param.getPrizeList(); List<SweetIntegralActivityPrizeFormParam> prizeList = param.getPrizeList();
if (!CollectionUtils.isEmpty(prizeList)) { if (!CollectionUtils.isEmpty(prizeList)) {
for (SweetIntegralActivityPrizeFormParam prize : prizeList) { for (SweetIntegralActivityPrizeFormParam prize : prizeList) {
if (prize.getPrizeType() == 1) { if (prize.getPrizeType() == 2) {
prize.setPrizeTypeNum(10); prize.setPrizeTypeNum(10);
} else { } else {
prize.setPrizeTypeNum(1); prize.setPrizeTypeNum(1);
...@@ -101,7 +101,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA ...@@ -101,7 +101,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
sweetIntegralActivityPrize.setUpdatedAt(LocalDateTime.now()); sweetIntegralActivityPrize.setUpdatedAt(LocalDateTime.now());
sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId); sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId);
String prizeId = prize.getPrizeId(); String prizeId = prize.getPrizeId();
if (prize.getPrizeType() == 1) { if (prize.getPrizeType() == 2) {
prize.setPrizeTypeNum(10); prize.setPrizeTypeNum(10);
} else { } else {
prize.setPrizeTypeNum(1); prize.setPrizeTypeNum(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 to comment