积分admin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html

@@ -125,7 +125,7 @@
                             case 2:
                                 receivingStatus = "已发放";
                                 break;
-                            case 2:
+                            case 3:
                                 receivingStatus = "无需发放";
                                 break;
                         }
@@ -141,7 +141,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发放</a> ');
+                        if (row.receivingStatus == 1) {
+                            actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发放</a> ');
+                        }
                         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

@@ -61,7 +61,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
             List<SweetIntegralActivityPrizeFormParam> prizeList = param.getPrizeList();
             if (!CollectionUtils.isEmpty(prizeList)) {
                 for (SweetIntegralActivityPrizeFormParam prize : prizeList) {
-                    if (prize.getPrizeType() == 1) {
+                    if (prize.getPrizeType() == 2) {
                         prize.setPrizeTypeNum(10);
                     } else {
                         prize.setPrizeTypeNum(1);
@@ -101,7 +101,7 @@ public class SweetIntegralActivityServiceImpl extends ServiceImpl<SweetIntegralA
                     sweetIntegralActivityPrize.setUpdatedAt(LocalDateTime.now());
                     sweetIntegralActivityPrize.setIntegralActivityId(integralActivityId);
                     String prizeId = prize.getPrizeId();
-                    if (prize.getPrizeType() == 1) {
+                    if (prize.getPrizeType() == 2) {
                         prize.setPrizeTypeNum(10);
                     } else {
                         prize.setPrizeTypeNum(1);