动态分享无券 + 下架 不能分享

yujian

2019-08-01 c22963a2ee796e59094524cadc5a78c450ed98f8

 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,16 +18,21 @@
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;

@@ -75,6 +81,12 @@


   @Resource

   private OrderProcessService orderProcessService;



   @Resource

   private HongBaoOrderService hongBaoOrderService;



   @Resource

   private UserMoneyDebtService userMoneyDebtService;



   /**

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

@@ -127,8 +139,9 @@
    * @param out

    */

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

   public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, 
         String key,   Integer state, Integer type, Integer orderState, String startTime, String endTime,

         Integer source, PrintWriter out) {



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

         pageIndex = 1;

@@ -154,11 +167,11 @@


         // 查询列表

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

               state, type, orderState, startTime, endTime);

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



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

            // 统计总数

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

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

         }



         // 查询是否维权

@@ -200,7 +213,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 {// 尚未退款