Merge remote-tracking branch 'origin/master'

happy-job-base-system/src/main/webapp/webpage/modules/mpmanager/mpMemberCompaignsRewardActionList.js

@@ -384,9 +384,9 @@ function rewardform(row,status) {
 	}else if(status==1){
         jp.openSaveDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '750PX', '330px');
     }else if(status==2){
-        jp.openSaveDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '750PX', '600px');
+        jp.openViewDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '750PX', '600px');
     }else if(status==3){
-        jp.openSaveDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '800PX', '350px');
+        jp.openViewDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '800PX', '350px');
     }else if(status==4){
         jp.openSaveDialog('操作',"${ctx}/mpmanager/mpMemberCompaignsRewardAction/operationForm?id=" + row.id+"&status="+status, '750PX', '450px');
     }

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/api/mpmanager/MpCompaignsRewardSettingControllerAPI.java

@@ -130,6 +130,8 @@ public class MpCompaignsRewardSettingControllerAPI extends BaseAppController {
                 obj = errorResult(ErrorCode.code_1027,"您慢了一步，已经被抢完了哦~");
             }else if ("1028".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_1028,"钱余额不足");
+            }else if ("1029".equals(returnMap.get("success"))) {
+                obj = errorResult(ErrorCode.code_1028,"该好礼还未到兑换时间，请耐心等待");
             }else {
                 obj = successResult(ErrorCode.code_1000, "好礼兑换成功", returnMap);
             }
@@ -279,6 +281,8 @@ public class MpCompaignsRewardSettingControllerAPI extends BaseAppController {
                 obj = errorResult(ErrorCode.code_1027,"您慢了一步，已经被抢完了哦~");
             }else if ("1028".equals(returnMap.get("success"))) {
                 obj = errorResult(ErrorCode.code_1028,"钱余额不足");
+            }else if ("1029".equals(returnMap.get("success"))) {
+                obj = errorResult(ErrorCode.code_1028,"该活动还未到兑换时间，请耐心等待");
             }else {
                 obj = successResult(ErrorCode.code_1000, "活动兑换成功", returnMap);
             }

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/mpmanager/service/MpCompaignsActivitySettingService.java

@@ -215,6 +215,11 @@ public class MpCompaignsActivitySettingService extends CrudService<MpCompaignsAc
                         return returnMap;
                     }
                 }
+                if(mpCompaignsActivitySettingAPI.getExchangeStartDate().getTime()>new Date().getTime()){
+                    returnMap.put("message", "该活动还未到兑换时间，请耐心等待");
+                    returnMap.put("success", "1029");
+                    return returnMap;
+                }
                 if (mpCompaignsActivitySettingAPI.getActivityNumber() == null || (mpCompaignsActivitySettingAPI.getActivityNumber() != null && mpCompaignsActivitySettingAPI.getActivityNumber() > mpCompaignsActivitySettingAPI.getAttendActivityNum())) {
                     if (mpCompaignsActivitySettingAPI.getExchangeEndDate().getTime() > new Date().getTime()) {
                         logger.info("getExchangeEndDate:"+mpCompaignsActivitySettingAPI.getExchangeEndDate());

happy-job-module-hpvip/src/main/java/com/jeeplus/modules/mpmanager/service/MpCompaignsRewardSettingService.java

@@ -216,6 +216,11 @@ public class MpCompaignsRewardSettingService extends CrudService<MpCompaignsRewa
                         return returnMap;
                     }
                 }
+                if(mpCompaignsRewardSettingAPI.getExchangeStartDate().getTime()>new Date().getTime()){
+                    returnMap.put("message", "该好礼还未到兑换时间，请耐心等待");
+                    returnMap.put("success", "1029");
+                    return returnMap;
+                }
                 if (mpCompaignsRewardSettingAPI.getRewardNumber() == null || mpCompaignsRewardSettingAPI.getExchangeRewardNum() < mpCompaignsRewardSettingAPI.getRewardNumber()) {
                     if (mpCompaignsRewardSettingAPI.getExchangeEndDate().getTime() > new Date().getTime()) {
                         if (mpMemberAccountAPI.getPointsBalance() >= mpCompaignsRewardSettingAPI.getPoints()) {