java/HongRuiTang.git

			@@ -8,7 +8,8 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsResult;
			import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsStatusResult;
			import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingReceiver;
			import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverRequest;
			import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverResult;
			import com.github.binarywang.wxpay.exception.WxPayException;
			import com.ruoyi.common.core.constant.CacheConstants;
			import com.ruoyi.common.core.exception.ServiceException;
			@@ -1115,8 +1116,12 @@
			String[] shopSalesKey = new String[shopSalesRank.size()];
			BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
			// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
			Long shopId;
			Shop shop;
			for (int i = 0; i < shopSalesRank.size(); i++) {
			shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
			shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
			shop = this.getByShopId(shopId);
			shopSalesKey[i] = shop.getShopName();
			shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
			}
			plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);
			@@ -1363,8 +1368,8 @@
			if (shopIdList != null && !shopIdList.isEmpty()) {
			Integer count = remoteMemberService.getAreaNewMember(shopIdList).getData();
			staffShopInfoGetVo.setNewAreaMember(count);
			ShopTotal shopTotalAll = shopTotalService.shopsTotalByIds(shopIdList);
			staffShopInfoGetVo.setAreaTurnover(shopTotalAll.getTotalOrderMoney());
			AgencyTotalVo agencyTotalVo = remoteOrderService.getAgencyTotalVo(shopIdList).getData();
			staffShopInfoGetVo.setAreaTurnover(agencyTotalVo.getAreaTurnover());
			}
			}
			// 如果商店的扩展联系方式不为空，则设置员工商店信息对象的扩展联系方式列表
			@@ -1594,9 +1599,10 @@
			* @return void
			*/
			@Override
			public void addProfitSharingReceiver(ProfitSharingReceiver profitSharingReceiver){
			public ProfitSharingReceiverResult addProfitSharingReceiver(ProfitSharingReceiverRequest request){
			try {
			ProfitSharingReceiver result = wechatPayUtils.addProfitSharingReceiver(profitSharingReceiver);
			ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
			return result;
			} catch (WxPayException e) {
			throw new RuntimeException(e);
			}