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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

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

@@ -131,6 +131,12 @@
         state = null; // 清空

      }



      // 转换状态

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

         orderState = 2; // 已维权

         state = null; // 清空

      }

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

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

      }

@@ -284,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, null);

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

         int self = 0;

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

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

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



         /* 今日订单统计 */

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

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



         int todaySelf = 0;

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

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



         /* 昨日订单统计 */

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

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

         int yesterdaySelf = 0;

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

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

@@ -468,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) {

@@ -485,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) {