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;

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

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

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

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

@@ -60,11 +59,6 @@


   @Resource

   private OrderService orderService;







   @Resource

   private BindingAccountService bindingAccountService;



   @Resource

   private ExtractService extractService;

@@ -126,7 +120,7 @@
         }

      }

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

      System system = xcxMiniControllerUtil.getSystem(acceptData);

      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

      if (system == null) {

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

         return;