主分类 + 子分类 DAO改造

yujian

2019-03-27 cdcbed9af813b2a02cdc01eefa24db8bec6b51a9

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -5,7 +5,6 @@
import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;

@@ -22,31 +21,23 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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

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

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

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

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.goods.CollectionGoodsV2;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

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.ExtractService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -68,28 +59,13 @@
   private OrderService orderService;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private MoneyRecordService moneyRecordService;



   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

   private ExtractService extractService;



   @Resource

   private PassWordErrorRecordService passWordErrorRecordService;



   @Resource

   private ConfigService configService;



   @Resource

   private XcxMiniControllerUtil xcxMiniControllerUtil;



   @Resource

   private HongBaoMessageService hongBaoMessageService;



   @Resource

   private ShamUserService shamUserService;

@@ -99,13 +75,7 @@


   @Resource

   private LostOrderService lostOrderService;



   @Resource

   private OrderItemServcie orderItemServcie;



   @Resource

   private AccountDetailsService accountDetailsService;



	
   @Resource

   private AccountMessageService accountMessageService;



@@ -113,9 +83,6 @@
   private CollectionGoodsV2Service collectionGoodsV2Service;

   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private WxDownService wxDownService;



   @Resource

   private RedisManager redisManager;

@@ -145,7 +112,7 @@
         }

      }

      // 不是用ID的登陆的事就多了

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

         return;

@@ -322,10 +289,10 @@
   }



   private void outUserInfo(PrintWriter out, String remotIP, UserInfo user, String device) {

      BigDecimal totalmoney = hongBaoService.getTotalHongBaoByUid(user.getId());

      BigDecimal totalmoney = new BigDecimal(0);

      user.setTotalHongBao(totalmoney);

      BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());

      BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());

      BigDecimal unOpenmoney = new BigDecimal(0);

      BigDecimal canOpenMoney = new BigDecimal(0);

      user.setNoOpenHongBao(unOpenmoney);

      user.setCanOpenHongBao(canOpenMoney);

      JSONObject data = new JSONObject();

@@ -339,7 +306,6 @@
            uuser.setLastLoginIp(remotIP);

            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

            userInfoService.updateLoginInfo(uuser);

            wxDownService.save(device);

         }

      });

   }

@@ -400,14 +366,12 @@
      List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);

      long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);

      JSONObject data = new JSONObject();

      Map<String, String> map = hongBaoManageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

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

      coList.parallelStream().forEachOrdered(cg -> {

         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,

               fcRate, "");

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

               proportion.toString(), "");

         list.add(taoBaoGoodsBriefExtra);

      });

      int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

@@ -457,22 +421,6 @@
         e.printStackTrace();

      }

      out.print(JsonUtil.loadTrueResult("删除成功"));

   }



   /**

    * 
    * 方法说明: 微信登陆

    * 
    * @author mawurui createTime 2018年4月25日 下午5:02:02

    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "isWxDown")

   public void isWxDown(AcceptData acceptData, PrintWriter out) {

      boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());

      JSONObject data = new JSONObject();

      data.put("isFirst", b);

      out.print(JsonUtil.loadTrueResult(data));

   }



   /**