首页悬浮图mapperbug修改，增加商品详情中的比例展示

admin

2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b

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

@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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

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

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

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

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

@@ -41,6 +42,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.UserOrderWeiQuanRecordService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

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

@@ -95,10 +97,12 @@


   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;

	


   @Resource

   private ConfigService configService;

	


   @Resource

   private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;



   /**

    * 统计历史订单-淘宝订单

@@ -180,12 +184,12 @@
         List<Long> listShopId = null;

         List<Long> listGoodsId = null;

         // 风险

         if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType!= null && keyType == 2) {

         if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType != null && keyType == 2) {

            long uid = Long.parseLong(key);

            // 查询同店铺商品，同商品订单超过一定数量的

            List<Integer> typeList = new ArrayList<>();

            typeList.add(HongBaoV2.TYPE_ZIGOU);

				


            if (riskType == 1) {

               listGoodsId = commonOrderCountService.getSameGoodsOrderByUidAndHongBaoType(typeList, uid,

                     Integer.parseInt(configService.get("admin_min_same_goods_order_count")));

@@ -194,7 +198,7 @@
                  return;

               }

            } else if (riskType == 2) {

               listShopId  = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,

               listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,

                     Integer.parseInt(configService.get("admin_min_same_shop_order_count")));

               if (listShopId == null || listShopId.isEmpty()) {

                  JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无同店铺订单"));

@@ -205,7 +209,7 @@
               minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);

            }

         }

			


         // 查询列表

         List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,

               state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money);

@@ -218,15 +222,15 @@
         for (CommonOrderVO order : list) {

            if (order.getUserId() == null)

               continue;

				


            // 查询是否维权

            TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());

            if (weiQuanOrder != null)// 有维权

            {

               order.setWeiQuanState(weiQuanOrder.getState());

               order.setState(CommonOrder.STATE_WQ);

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),

                     Long.parseLong(order.getUserId()));

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(

                     weiQuanOrder.getOrderItemId(), Long.parseLong(order.getUserId()));

               if (drawBack != null) {// 已经退款



                  // 计算退款资金

@@ -275,7 +279,14 @@
                  }



               } else {// 尚未退款

                  order.setWeiQuanBackMoney("-" + order.getHongBao());

                  UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService.selectByOrderInfoAndUid(

                        Long.parseLong(order.getUserId()), weiQuanOrder.getOrderItemId(),

                        Constant.SOURCE_TYPE_TAOBAO);

                  if (record != null)

                     order.setWeiQuanBackMoney("-" + record.getMoney());

                  else {

                     order.setWeiQuanBackMoney("-" + order.getHongBao());

                  }

               }

            }

         }

@@ -444,8 +455,8 @@
         JSONArray line_list = new JSONArray();



         for (String channel : channelList) {

            List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,

                  startTime, endTime);

            List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year, startTime,

                  endTime);



            if ("all".equalsIgnoreCase(channel)) {

               channel = "总计";

@@ -715,8 +726,7 @@
      try {

         JSONArray line_list = new JSONArray();

         for (Integer type : channelList) {

            List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,

                  endTime);

            List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime, endTime);

            JSONObject innerList = new JSONObject();

            if (type == 1) {

               innerList.put("name", "返利订单");

@@ -805,8 +815,8 @@


         JSONArray line_list = new JSONArray();



         List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,

               endTime, sourceType);

         List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime, endTime,

               sourceType);



         JSONObject innerList = new JSONObject();

         innerList.put("name", "总计");