订单接口筛选统计数据调整

yujian

2019-01-04 38fffe4319f408b5dc1da23d30512e90b0f4feac

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -16,9 +16,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -57,6 +54,7 @@
import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

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

import com.yeshi.fanli.entity.system.System;

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

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

@@ -77,7 +75,6 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

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

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

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

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

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

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

@@ -88,6 +85,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountService;

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

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

@@ -100,9 +98,13 @@
import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.email.MailSenderUtil;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/v1/customer")

@@ -150,8 +152,6 @@
   @Resource

   private OrderItemServcie orderItemServcie;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private AccountMessageService accountMessageService;

@@ -179,6 +179,9 @@


   @Resource

   private AdminUserService adminUserService;



   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -1518,17 +1521,15 @@
            Constant.PAGE_SIZE);



      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

		
		


      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

      JSONObject data = new JSONObject();

	
		


      List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();

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

			


         BigDecimal proportion = hongBaoManageService.getFanLiRate();

			


         List<Long> listGid = new ArrayList<Long>();

         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

@@ -1537,7 +1538,7 @@
            }

            listGid.add(commonGoods.getGoodsId());

         }

			


         try {

            // API网络接口验证是否在售

            listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);

@@ -1548,17 +1549,17 @@
         } catch (Exception e) {

            e.printStackTrace();

         }

			


         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();

            if (commonGoods == null) {

               continue;

            }

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

               int state = 1;  // 默认停售



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

               int state = 1; // 默认停售

               Long goodsId = commonGoods.getGoodsId();

               for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {

               for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {

                  Long auctionId = taoKeGoods.getAuctionId();

                  if (goodsId == auctionId || goodsId.equals(auctionId)) {

                     state = 0; // 在售

@@ -1567,18 +1568,18 @@
               }

               commonGoods.setState(state);

            }

				


            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

            goodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(goodsBrief.getBiz30day()));

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                  proportion.toString(), "");

            taoBaoGoodsBriefExtra.setCreatetime(collectionGoodsV2.getCreateTime());

				


            list.add(taoBaoGoodsBriefExtra);

         }

			


      }

		


      GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

         @Override

         public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {

@@ -1640,8 +1641,11 @@


   @RequestMapping("findAccountDetailsList")

   public void findAccountDetailsList(AcceptData acceptData, long uid, int page, PrintWriter out) {

      List<AccountDetails> list = accountDetailsService.findAccountDetailsList(uid, page);

      int count = accountDetailsService.getCount(uid);

      List<UserMoneyDetail> detailList = userMoneyDetailService.listByUidWithState(uid, page, Constant.PAGE_SIZE);

      List<AccountDetails> list = new ArrayList<>();

      for (UserMoneyDetail detail : detailList)

         list.add(AccountDetailsFactory.create(detail));

      long count = userMoneyDetailService.countByUidWithState(uid);

      JSONObject data = new JSONObject();

      data.put("list", GsonUtil.toJsonExpose(list));

      data.put("count", count);

@@ -1649,9 +1653,21 @@
   }



   @RequestMapping("findAccountDetailsListV2")

   public void findAccountDetailsListNew(AcceptData acceptData, long uid, int page, PrintWriter out) {

      List<AccountDetails> list = accountDetailsService.findAccountDetailsListWithState(uid, page);

      long count = accountDetailsService.getCountWithState(uid);

   public void findAccountDetailsListNew(AcceptData acceptData, Long uid, int page, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "UID为空"));

         return;

      }



      List<UserMoneyDetail> detailList = userMoneyDetailService.listByUidWithState(uid, page, Constant.PAGE_SIZE);



      List<AccountDetails> list = new ArrayList<>();

      for (UserMoneyDetail detail : detailList)

         list.add(AccountDetailsFactory.create(detail));



      long count = userMoneyDetailService.countByUidWithState(uid);



      JSONObject data = new JSONObject();

      JSONArray array = new JSONArray();

      for (AccountDetails ad : list) {