模拟请求缓存商品数据，淘礼金商品兼容多个appkey

admin

2019-08-13 37194e2d4b4ab85f7f29c1e900c406afe294579a

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;

@@ -17,22 +18,28 @@
import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;

import com.yeshi.fanli.entity.money.UserMoneyDebt;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

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.taobao.TaoBaoWeiQuanDrawBack;

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

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

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

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

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

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.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -75,6 +82,15 @@


   @Resource

   private OrderProcessService orderProcessService;



   @Resource

   private HongBaoOrderService hongBaoOrderService;



   @Resource

   private UserMoneyDebtService userMoneyDebtService;



   @Resource

   private UserSystemCouponRecordService userSystemCouponRecordService;



   /**

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

@@ -128,7 +144,8 @@
    */

   @RequestMapping(value = "getUserOrderList")

   public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,

         Integer state, Integer type, Integer orderState, String startTime, String endTime, PrintWriter out) {

         Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,

         PrintWriter out) {



      if (pageIndex == null || pageIndex < 1) {

         pageIndex = 1;

@@ -150,16 +167,13 @@
      }



      try {

         long count = 0;



         // 查询列表

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

               state, type, orderState, startTime, endTime);

               state, type, orderState, startTime, endTime, sourceType);



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

            // 统计总数

            count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime);

         }

         // 统计总数

         long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,

               sourceType);



         // 查询是否维权

         for (CommonOrderVO order : list) {

@@ -200,7 +214,22 @@
                     // 退款成功

                     order.setWeiQuanBackMoney(detail.getMoney().abs().toString());

                  } else {// 尚未退款

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

                     order.setWeiQuanBackMoney(drawBack.getDrawBackMoney().toString());

                     // 查询出对应的hongBaoId

                     CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(

                           Constant.SOURCE_TYPE_TAOBAO, drawBack.getOrderItemId());

                     if (commonOrder != null) {

                        HongBaoOrder hongBaoOrder = hongBaoOrderService

                              .selectDetailByCommonOrderId(commonOrder.getId());

                        if (hongBaoOrder != null) {

                           UserMoneyDebt debt = userMoneyDebtService.selectByTypeAndSourceId(

                                 UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());

                           if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0) {

                              order.setWeiQuanBackMoney(

                                    new BigDecimal(0).subtract(debt.getLeftMoney()).toString());// 未扣除

                           }

                        }

                     }

                  }



               } else {// 尚未退款

@@ -708,7 +737,7 @@
    */

   @RequestMapping(value = "getTrackAccuracyRate")

   public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,

         PrintWriter out) {

         int sourceType, PrintWriter out) {



      if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {

         startTime = null;

@@ -744,7 +773,7 @@
         JSONArray line_list = new JSONArray();



         List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,

               endTime);

               endTime, sourceType);



         JSONObject innerList = new JSONObject();

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