订单

yujian

2020-06-09 554de444b87aab5f93cb1593a8095612cf9479a7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java

@@ -14,9 +14,9 @@
import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.exception.user.UserSystemCouponException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -25,12 +25,12 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;

import com.yeshi.fanli.vo.user.UserSystemCouponVO;



import net.sf.json.JSONObject;

@@ -72,10 +72,6 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



	
   @Resource

   private UserLotteryRecordService userLotteryRecordService;

	
   @Resource

   private UserVIPInfoService userVIPInfoService;



@@ -103,7 +99,7 @@
         JSONObject data = new JSONObject();

         if (page == 1) {

            // 福利中心图片

            List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top_1.6.5",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

            List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top_1.6.5",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

            if (listswiper != null && listswiper.size() > 0) {

               String topPicture = listswiper.get(0).getSrc();

               data.put("topPicture", topPicture);

@@ -120,9 +116,16 @@
         data.put("count", count);

         data.put("list", JsonUtil.getApiCommonGson().toJson(resultList));

         out.print(JsonUtil.loadTrueResult(data));

			
         // 更新福利中心未读数量

         if (page == 1) {

      } catch (UserSystemCouponException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "查询失败"));

         LogHelper.errorDetailInfo(e);

      }

		
      // 更新福利中心未读数量

      if (page == 1) {

         try {

            executor.execute(new Runnable() {

               @Override

               public void run() {

@@ -136,12 +139,8 @@
                  }

               }

            });

         } catch (Exception e) {

         }

      } catch (UserSystemCouponException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "查询失败"));

         LogHelper.errorDetailInfo(e);

      }

   }



@@ -182,21 +181,21 @@
    * @param uid

    * @param out

    */

   @RequestMapping(value = "getOrderCouponList", method = RequestMethod.POST)

   public void getOrderCouponList(AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {

   @RequestMapping(value = "getOrderCouponList")

   public void getOrderCouponList(String callback, AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {

      if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {

         out.print(JsonUtil.loadFalseResult("传递参数信息不完整"));

         JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("传递参数信息不完整"));

         return;

      }

      

      if (userVIPInfoService.isVIP(uid)) {

         out.print(JsonUtil.loadFalseResult("超级会员不可使用奖励券"));

         JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("超级会员不可使用奖励券"));

         return;

      }

      

      List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);

      if (listOrder == null || listOrder.size() == 0) {

         out.print(JsonUtil.loadFalseResult("订单号不存在"));

         JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("订单号不存在"));

         return;

      }

      

@@ -205,7 +204,7 @@
      for (CommonOrder commonOrder: listOrder) {

         Integer wholeOrder = commonOrder.getStateWholeOrder();

         if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO ==  wholeOrder) {

            out.print(JsonUtil.loadFalseResult("整个订单已失效"));

            JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("整个订单已失效"));

            return;

         }

         

@@ -229,14 +228,14 @@
         }



         JSONObject data = new JSONObject();

         data.put("helpLink", configService.get("reward_coupon_help"));

         data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));

         data.put("count", resultList.size());

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));

         out.print(JsonUtil.loadTrueResult(data));

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

      } catch (UserSystemCouponException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

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

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "查询失败"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "查询失败"));

         LogHelper.errorDetailInfo(e);

      }

   }