Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

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

@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

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;

@@ -31,16 +31,11 @@
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.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;

@@ -66,15 +61,6 @@
   private OrderService orderService;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private MoneyRecordService moneyRecordService;



   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

   private ExtractService extractService;



   @Resource

@@ -94,13 +80,7 @@


   @Resource

   private LostOrderService lostOrderService;



   @Resource

   private OrderItemServcie orderItemServcie;



   @Resource

   private AccountDetailsService accountDetailsService;



	
   @Resource

   private AccountMessageService accountMessageService;



@@ -140,7 +120,7 @@
         }

      }

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

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

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

         return;

@@ -317,10 +297,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();