推广红包-不在收回

yujian

2019-07-23 c76ad0e79b95c0bceed8a0234211f2c7f0168b14

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -1,8 +1,10 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -76,7 +78,8 @@
         pushGoodsService.save(pushGoods, list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功"));



      } catch (PushGoodsException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

@@ -143,13 +146,24 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("数据信息已不存在"));

            return;

         }

			
         Date controlTime = pushGoods.getControlTime();

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

         if (controlTime == null) {

            pushGoods.setTimeTask(false);

            pushGoods.setControlTime_str("");

         } else {

            pushGoods.setTimeTask(true);

            pushGoods.setControlTime_str(sdf.format(controlTime));

         }

			


         // 版本处理

         convertVersionList(pushGoods);

         

         List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();

         

         List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushGoods.getId());

         List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(id);

         if (listGroup == null) {

            listGroup = new ArrayList<PushGoodsGroup>();

         } else {

@@ -162,8 +176,12 @@
            }

         }

         

         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         Gson gson = gsonBuilder.create();

			
         JSONObject data = new JSONObject();

         data.put("pushGoods", pushGoods);

         data.put("pushGoods", gson.toJson(pushGoods));

         data.put("listGroup", listgoods);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

@@ -205,6 +223,17 @@
         }



         for (PushGoods pushGoods : list) {

				
            Date controlTime = pushGoods.getControlTime();

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

            if (controlTime == null) {

               pushGoods.setTimeTask(false);

               pushGoods.setControlTime_str("");

            } else {

               pushGoods.setTimeTask(true);

               pushGoods.setControlTime_str(sdf.format(controlTime));

            }

				
            long countGoods = pushGoodsGroupService.countByPushId(pushGoods.getId());

            pushGoods.setCountGoods(countGoods);

            

@@ -260,7 +289,7 @@
         }

            

         for (Long id: list) {

            pushGoodsService.executePush(id);

            pushGoodsService.handPush(id);

         }

         

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("推送成功"));