java/qijisheng.git

			@@ -8,6 +8,7 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.account.api.feignClient.*;
			import com.ruoyi.account.api.model.*;
			import com.ruoyi.common.core.constant.ExpressCompanyMap;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.StringUtils;
			@@ -35,12 +36,15 @@
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.api.feignClient.SysUserClient;
			import com.ruoyi.system.api.model.LoginUser;
			import org.apache.poi.ss.usermodel.*;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;

			import javax.annotation.Resource;
			import java.io.IOException;
			import java.io.InputStream;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.time.LocalDateTime;
			@@ -342,6 +346,14 @@
			List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), Long.valueOf(orderPageListVo.getId())).getData();
			BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
			orderPageListVo.setGetCommission(reduce);

			String expressJson = orderPageListVo.getExpressJson();
			// {"com":"zhongtong","num":"78853319672621"}
			JSONObject jsonObject = JSONObject.parseObject(expressJson);

			String companyName = ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com"));
			orderPageListVo.setExpressCompany(companyName);
			orderPageListVo.setExpressNum(jsonObject.getString("num"));
			}
			return pageInfo.setRecords(list);
			}
			@@ -531,8 +543,7 @@
			appUserClient.editAppUserById(appUser);

			//降级检测
			boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
			if(vipDemotion){
			if(1 < appUser.getVipId() && appUser.getVipId() < 4){
			appUserClient.vipDemotion(appUser.getId());
			}
			//回退优惠券状态
			@@ -668,8 +679,7 @@
			appUserClient.editAppUserById(appUser);

			//降级检测
			boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
			if(vipDemotion){
			if(1 < appUser.getVipId() && appUser.getVipId() < 4){
			appUserClient.vipDemotion(appUser.getId());
			}

			@@ -730,18 +740,7 @@
			return R.ok();
			}

			/**
			* 会员降级检测
			*/
			public boolean vipDemotion(Integer shopPoint, Integer vipId){
			if(vipId == 1 \|\| vipId > 3){
			return false;
			}
			VipSetting vipSetting = vipSettingClient.getVipSetting(vipId).getData();
			Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
			Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
			return 1 == vipLevelUpShopRole && shopPoint < vipLevelUpShop;
			}



			/**
			@@ -816,6 +815,7 @@
			}
			List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
			int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
			System.out.println("111111111111222");
			orderInfo.setGoodsNum(sum);
			List<Object> goodsJson = new ArrayList<>();
			for (OrderGood orderGood : orderGoods) {
			@@ -913,4 +913,44 @@
			}
			}
			}

			@Override
			public void importExpress(MultipartFile file) {
			try (InputStream inputStream = file.getInputStream()) {
			Workbook workbook = WorkbookFactory.create(inputStream);
			Sheet sheet = workbook.getSheetAt(0); // 获取第一个Sheet
			int lastRowNum = sheet.getLastRowNum();
			for (int i = 1; i <= lastRowNum; i++) {
			Row row = sheet.getRow(i);
			String orderNum = row.getCell(1).getStringCellValue();
			// 快递单号
			String expressNum = row.getCell(7).getStringCellValue();
			// 快递公司名称
			String expressName = row.getCell(8).getStringCellValue();
			// 省区划代码
			String provinceCode = row.getCell(10).getStringCellValue();
			// 市区划代码
			String cityCode = row.getCell(12).getStringCellValue();
			Order order = this.getOne(new LambdaQueryWrapper<Order>()
			.eq(Order::getOrderNumber, orderNum)
			.eq(Order::getOrderType, 1)
			.eq(Order::getDistributionMode,2)
			.eq(Order::getOrderStatus, 1)
			);
			if (order != null){
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("com", expressName);
			jsonObject.put("num", expressNum);
			order.setExpressJson(jsonObject.toJSONString());
			order.setDeliverProvinceCode(provinceCode);
			order.setDeliverCityCode(cityCode);
			order.setOrderStatus(2);
			this.updateById(order);
			}
			}

			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			}
			}