推荐删除

yujian

2019-07-22 e43e23fbe78dc58079359586ddc129cc8ec036bc

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

@@ -15,7 +15,6 @@
import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

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

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

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

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

@@ -121,8 +120,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;

@@ -148,11 +148,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);

         }



         // 查询是否维权

@@ -161,15 +161,16 @@
            TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());

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

            {

               order.setWeiQuanState(weiQuanOrder.getState());

               order.setState(CommonOrder.STATE_WQ);

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService

                     .selectByOrderItemId(weiQuanOrder.getOrderItemId());

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

                  order.setWeiQuanState(weiQuanOrder.getState());

						
                  // 计算退款资金

                  UserMoneyDetail detail = null;

                  switch (order.getHongBaoType()) {

                  case HongBaoV2.TYPE_ZIGOU:

                  case 1:

                     detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                           UserMoneyDetailTypeEnum.fanliWeiQuan, Long.parseLong(order.getUserId()),

                           drawBack.getId());

@@ -178,16 +179,12 @@
                              UserMoneyDetailTypeEnum.weiQuan, Long.parseLong(order.getUserId()),

                              drawBack.getId());

                     break;

                  case HongBaoV2.TYPE_YIJI:

                  case HongBaoV2.TYPE_ERJI:

                  case HongBaoV2.TYPE_SHARE_YIJI:

                  case HongBaoV2.TYPE_SHARE_ERJI:

                  case 3:

                     detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                           UserMoneyDetailTypeEnum.inviteWeiQuan, Long.parseLong(order.getUserId()),

                           drawBack.getId());

                     break;



                  case HongBaoV2.TYPE_SHARE_GOODS:

                  case 2:

                     detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(

                           UserMoneyDetailTypeEnum.shareWeiQuan, Long.parseLong(order.getUserId()),

                           drawBack.getId());