~jiangyouyao/beauty-erp.git

			@@ -6,8 +6,9 @@
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.matrix.biz.bean.BizUser;
			import com.matrix.biz.dao.BizUserDao;
			import com.matrix.system.fenxiao.vo.FenxiaoOrderListExportVo;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.system.hive.dao.SysVipInfoDao;
			import com.matrix.core.constance.MatrixConstance;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.tools.StringUtils;
			@@ -58,7 +59,7 @@
			@Autowired
			ShopOrderDao shopOrderDao;
			@Autowired
			BizUserDao bizUserDao;
			SysVipInfoDao sysVipInfoDao;

			public AjaxResult loadFenxiaoOrderBasic(LoadFenxiaoOrderBasicDto loadFenxiaoOrderBasicDto) {
			//设置用户公司ID
			@@ -163,15 +164,15 @@
			shopRevenueFlowDao.insert(salesRevenueFlow);
			//选择微信余额支付，更新用户的金额
			if(ShopSalemanSettlement.SETTLEMENTWAY_YEJS == updateSetOrderDoneDto.getSetType()) {
			BizUser findByOpenId = bizUserDao.findByOpenId(shopSalesmanOrder.getSalesUserId());
			if(ObjectUtil.isEmpty(findByOpenId)) {
			SysVipInfo vipInfo = sysVipInfoDao.selectById(shopSalesmanOrder.getSalesUserId());
			if(ObjectUtil.isEmpty(vipInfo)) {
			return AjaxResult.buildFailInstance("收益人信息不存在");
			}
			Double withdrawalCash = findByOpenId.getWithdrawalCash();
			Double withdrawalCash = vipInfo.getWithdrawalCash();
			Double amount = shopSalesmanOrder.getAmount();
			withdrawalCash = (withdrawalCash == null?0:withdrawalCash)+(amount== null?0:amount);
			findByOpenId.setWithdrawalCash(withdrawalCash);
			bizUserDao.updateByModel(findByOpenId);
			vipInfo.setWithdrawalCash(withdrawalCash);
			sysVipInfoDao.update(vipInfo);
			}
			}
			}
			@@ -179,7 +180,9 @@
			}


			public List<FenxiaoOrderListExportVo> findFenxiaoOrderList(LoadFenxiaoOrderListDto loadFenxiaoOrderListDto) {
			QueryUtil.setQueryLimitCom(loadFenxiaoOrderListDto);
			return shopSalesmanOrderDao.selectFenxiaoOrderListNoPage(loadFenxiaoOrderListDto);
			}



			}