yujian
2019-03-27 cdcbed9af813b2a02cdc01eefa24db8bec6b51a9
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,18 +31,13 @@
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.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;
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;
@@ -64,18 +59,7 @@
   private OrderService orderService;
   @Resource
   private HongBaoService hongBaoService;
   @Resource
   private BindingAccountService bindingAccountService;
   @Resource
   private ExtractService extractService;
   @Resource
   private PassWordErrorRecordService passWordErrorRecordService;
   @Resource
   private ConfigService configService;
@@ -91,9 +75,6 @@
   @Resource
   private LostOrderService lostOrderService;
   @Resource
   private OrderItemServcie orderItemServcie;
   
   @Resource
   private AccountMessageService accountMessageService;
@@ -102,9 +83,6 @@
   private CollectionGoodsV2Service collectionGoodsV2Service;
   @Resource
   private HongBaoManageService hongBaoManageService;
   @Resource
   private WxDownService wxDownService;
   @Resource
   private RedisManager redisManager;
@@ -134,7 +112,7 @@
         }
      }
      // 不是用ID的登陆的事就多了
      System system = xcxMiniControllerUtil.getSystem(acceptData);
      BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
      if (system == null) {
         out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
         return;
@@ -311,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();
@@ -328,7 +306,6 @@
            uuser.setLastLoginIp(remotIP);
            uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
            userInfoService.updateLoginInfo(uuser);
            wxDownService.save(device);
         }
      });
   }
@@ -444,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));
   }
   /**