增加通用模板免单内容

admin

2019-08-19 27920d99bc5925de113aa4f0c22dbba3dcea672f

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java

@@ -8,7 +8,6 @@
import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;



import org.springframework.stereotype.Controller;

@@ -42,6 +41,7 @@
import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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.user.UserInfoExtraVO;

@@ -110,7 +110,7 @@
   @RequestMapping(value = "getorder", method = RequestMethod.POST)

   public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,

         String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,

         PrintWriter out) {

         Integer goodsType, PrintWriter out) {



      if (uid == null) {

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

@@ -131,8 +131,20 @@
         state = null; // 清空

      }



      // 转换状态

      if (state != null && state == 5) {

         orderState = 2; // 已维权

         state = null; // 清空

      }

				
      if (type != null && type == 0) {

         type = null; // 所有类型订单

      }

		
      if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      } else if (goodsType != null && goodsType == 0){

         goodsType = null; // 所有平台订单

      }



      try {

@@ -158,25 +170,25 @@
         BigDecimal todayMoney = null;



         // 查询列表

         List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState, orderNo,

               startTime, endTime, dateType);

         List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, type, orderState, orderNo,

               startTime, endTime, dateType, goodsType);



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

            // 统计总数

            count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime,

                  endTime, dateType);

                  endTime, dateType, goodsType);

         }



         // 需要统计筛选信息 ：未失效的总金额 以及订单

         if (needCount && page == 1) {



            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);

            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime, goodsType);



            todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);

            todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime, goodsType);



            // 统计有效的订单数量 、 失效订单数量 、维权订单数量

            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime,

                  endTime, dateType);

                  endTime, dateType, goodsType);



            if (countOrder.get("totalValid") != null) {

               totalValid = countOrder.get("totalValid").intValue();

@@ -278,8 +290,13 @@
         JSONObject data = new JSONObject();

         data.put("userInfo", userInfo);



         Integer goodsType = null; // 版本区分

         if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

         } 
			
         /* 总订单统计 */

         Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null);

         Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, goodsType);

         int self = 0;

         if (countOrder.get("totalSelf") != null) {

            self = countOrder.get("totalSelf").intValue();

@@ -303,7 +320,7 @@
         data.put("invite", invite);



         /* 今日订单统计 */

         Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1);

         Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);



         int todaySelf = 0;

         if (countToday.get("totalSelf") != null) {

@@ -331,7 +348,7 @@
         data.put("today", todaydata);



         /* 昨日订单统计 */

         Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2);

         Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, goodsType);

         int yesterdaySelf = 0;

         if (countYesterday.get("totalSelf") != null) {

            yesterdaySelf = countYesterday.get("totalSelf").intValue();

@@ -362,7 +379,85 @@
         e.printStackTrace();

      }

   }

	
	
   /**

    * 统计各个平台数据

    * @param acceptData

    * @param uid

    * @param goodsType

    * @param out

    */

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

   public void getNearOrderNum(AcceptData acceptData, Long uid, Integer goodsType, PrintWriter out) {



      if (uid == null) {

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

         return;

      }



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

         out.print(JsonUtil.loadFalseResult(1, "平台类型缺失或不正确"));

         return;

      }

		
      /* 今日订单统计 */

      Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);



      int todaySelf = 0;

      if (countToday.get("totalSelf") != null) {

         todaySelf = countToday.get("totalSelf").intValue();

      }



      int todayShared = 0;

      if (countToday.get("totalShared") != null) {

         todayShared = countToday.get("totalShared").intValue();

      }



      int todayInvite = 0;

      if (countToday.get("totalInvite") != null) {

         todayInvite = countToday.get("totalInvite").intValue();

      }



      int todayTotal = todaySelf + todayShared + todayInvite;



      JSONObject todaydata = new JSONObject();

      todaydata.put("total", todayTotal);

      todaydata.put("self", todaySelf);

      todaydata.put("shared", todayShared);

      todaydata.put("invite", todayInvite);



      /* 昨日订单统计 */

      Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, goodsType);

      int yesterdaySelf = 0;

      if (countYesterday.get("totalSelf") != null) {

         yesterdaySelf = countYesterday.get("totalSelf").intValue();

      }



      int yesterdayShared = 0;

      if (countYesterday.get("totalShared") != null) {

         yesterdayShared = countYesterday.get("totalShared").intValue();

      }

      int yesterdayInvite = 0;

      if (countYesterday.get("totalInvite") != null) {

         yesterdayInvite = countYesterday.get("totalInvite").intValue();

      }

      int yesterdayTotal = yesterdaySelf + yesterdayShared + yesterdayInvite;



      JSONObject yesterdaydata = new JSONObject();

      yesterdaydata.put("total", yesterdayTotal);

      yesterdaydata.put("self", yesterdaySelf);

      yesterdaydata.put("shared", yesterdayShared);

      yesterdaydata.put("invite", yesterdayInvite);



      JSONObject data = new JSONObject();



      data.put("today", todaydata);

      data.put("yesterday", yesterdaydata);

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

   }

	
	
   /**

    * 统计奖金

    * 

@@ -384,9 +479,14 @@
         BigDecimal sharemoney = new BigDecimal(0.00);

         Object inviteCount = 0;

         BigDecimal inviteMoney = new BigDecimal(0.00);

			
         Integer goodsType = null; // 版本区分

         if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

         } 


         Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 2, dateType, null,

               null);

               null, goodsType);

         if (shareMap != null) {

            Object totalNum = shareMap.get("totalNum");

            if (totalNum != null) {

@@ -401,7 +501,7 @@


         // 邀请统计

         Map<String, Object> inviteMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 3, dateType, null,

               null);

               null, goodsType);

         if (inviteMap != null) {

            Object totalNum = inviteMap.get("totalNum");

            if (totalNum != null) {

@@ -495,7 +595,7 @@
                     try {

                        isS = orderService.addOrder(or);

                        if (isS) {

                           CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);

                           CMQManager.getInstance().addTaoBaoOrderMsg(order);

                           // 加入到LostOrder

                           LostOrder lo = new LostOrder();

                           lo.setCreateTime(System.currentTimeMillis());