Merge remote-tracking branch 'origin/div' into div-1

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

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

@@ -18,6 +18,7 @@


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

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

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

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

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

import com.yeshi.fanli.exception.order.CommonOrderException;

@@ -35,7 +36,10 @@
import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.order.GoodsRebateVO;

import com.yeshi.fanli.vo.order.OrderCountVO;

import com.yeshi.fanli.vo.order.OrderRebateVO;

import com.yeshi.fanli.vo.order.TeamBonusVO;

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

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



@@ -230,6 +234,7 @@
         data.put("count", count);

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

         data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));

         data.put("bonusLink", configService.get(ConfigKeyEnum.orderBonusLink.getKey()));

         data.put("validMoney", "¥ " + validMoney);

         data.put("invalidMoney", "¥ " + invalidMoney);

         data.put("findOrderHelpUrl", orderFindUrl);

@@ -258,7 +263,7 @@
         if (list == null || list.size() == 0) {

            List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);

            if (listES.size() != 0) {

               list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);

               list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);

               count = commonOrderService.countSearchOrderByUid(uid, listES);

            }

         } else {

@@ -395,8 +400,127 @@
      data.put("selfMoney", selfMoney.setScale(2,BigDecimal.ROUND_DOWN).toString());

      data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

      data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

		
      // 团队奖励 TODO

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         data.put("teamSubsidy", "999.66");

         data.put("teamReward", "777.66");

         data.put("tutorSubsidy", "888.66");

      }

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

   }



   

   /**

    * 团队收益统计

    * @param acceptData

    * @param uid

    * @param type 1-团队补贴   2-团队奖励 3-导师津贴

    */

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

   public void getTeamBonus(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

		
      UserInfo user = userInfoService.selectByPKey(uid);

      if (user == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户不存在"));

         return;

      }

		
      if (type == null || type < 1 || type > 3) {

         type = 1;

      }

		
      JSONObject data = new JSONObject();

      data.put("link", "https://www.baidu.com/");

      String total = "";

      if (type == 1) {

         total = "111.3";

      } else if (type == 2) {

         total = "222.3";

      } else if (type == 3) {

         total = "333.3";

      }

		
      if (StringUtil.isNullOrEmpty(total)) {

         data.put("exist", false);

      } else {

         data.put("exist",  true);

         data.put("portrait", user.getPortrait());

			
         TeamBonusVO today = new TeamBonusVO("1.3", "2.3" ,"3.6");

         TeamBonusVO yesterday = new TeamBonusVO("1.3", "2.3" ,"3.6");

         TeamBonusVO thisMonth = new TeamBonusVO("1.3", "2.3" ,"3.6");

         TeamBonusVO lastMonth = new TeamBonusVO("1.3", "2.3" ,"3.6");

         data.put("total", total);

         data.put("direct", "655.36");

         data.put("indirect", "236.58");

         data.put("today", today);

         data.put("yesterday", yesterday);

         data.put("thisMonth", thisMonth);

         data.put("lastMonth", lastMonth);

      }

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

   }



	
   /**

    * 返利说明

    * @param acceptData

    * @param uid

    * @param orderNo

    * @param sourceType

    * @param out

    */

   @RequestMapping(value = "getReBateInfo")

   public void getReBateInfo(String callback, AcceptData acceptData, Long uid, String orderNo, Integer sourceType, PrintWriter out) {

      if (uid == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

         return;

      }

		
      UserInfo user = userInfoService.selectByPKey(uid);

      if (user == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户不存在"));

         return;

      }

		
      GoodsRebateVO goodsVO = new GoodsRebateVO();

      goodsVO.setTitle("舒客舒克光感炫白牙片美白牙齿牙膜套装去黄牙清新口气");

      goodsVO.setPicture("https://img.alicdn.com/bao/uploaded/i4/355739614/O1CN01RB6Hlg2KtGMWR4mON_!!0-item_pic.jpg");

      goodsVO.setActualPay("¥60.00");

      goodsVO.setFanliRate("X20%");

      goodsVO.setFanliExpect("¥25.00");

      goodsVO.setCommision("10.00");

      goodsVO.setSubsidy("6.00");

		
      GoodsRebateVO goodsVO2 = new GoodsRebateVO();

      goodsVO2.setTitle("馥佩美白柔肤水爽肤水补水保湿女化妆湿敷精华水男旗舰店官网正品");

      goodsVO2.setPicture("https://img.alicdn.com/bao/uploaded/i4/738252756/O1CN01MgFdXy1WEI8zmkyg7_!!0-item_pic.jpg");

      goodsVO2.setActualPay("¥62.00");

      goodsVO2.setFanliRate("X22%");

      goodsVO2.setFanliExpect("¥26.00");

      goodsVO2.setCommision("12.00");

      goodsVO2.setSubsidy("8.00");

		
      List<GoodsRebateVO> listGoods= new ArrayList<>();

      listGoods.add(goodsVO);

      listGoods.add(goodsVO2);

		
      OrderRebateVO orderRebateVO = new OrderRebateVO();

      orderRebateVO.setTotalFanLi("¥50.00");

      orderRebateVO.setUpperFanLi("¥60.00");

      orderRebateVO.setUserLevel(UserLevelEnum.daRen.name());

      orderRebateVO.setJumpLink("https://www.baidu.com/");

      orderRebateVO.setListGoods(listGoods);

		
      JSONObject data = new JSONObject();

      data.put("result", orderRebateVO);

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

   }



	
}