java/mx_charging_pile.git

			@@ -6,6 +6,9 @@
			import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
			import com.ruoyi.chargingPile.api.feignClient.SiteClient;
			import com.ruoyi.chargingPile.api.model.Site;
			import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
			import com.ruoyi.chargingPile.api.feignClient.SiteClient;
			import com.ruoyi.chargingPile.api.model.Site;
			import com.ruoyi.chargingPile.api.model.TChargingGun;
			import com.ruoyi.chargingPile.api.model.TChargingPile;
			import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
			@@ -13,6 +16,7 @@
			import com.ruoyi.chargingPile.domain.SiteMenu;
			import com.ruoyi.chargingPile.mapper.TChargingGunMapper;
			import com.ruoyi.chargingPile.service.IPartnerService;
			import com.ruoyi.chargingPile.service.TAccountingStrategyService;
			import com.ruoyi.chargingPile.service.TChargingGunService;
			import com.ruoyi.chargingPile.service.TChargingPileService;
			import com.ruoyi.common.core.enums.status.ChargingGunModeEnum;

			@@ -318,6 +318,8 @@
			@Override
			public List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query) {
			Long appUserId = tokenService.getLoginUserApplet().getUserId();

			query.setPageCurr((query.getPageCurr() - 1) * query.getPageSize());
			List<TChargingOrder> orderList = this.baseMapper.getNoInvoicedOrder(appUserId, query.getMonth(), query.getPageCurr(), query.getPageSize());
			List<MyChargingOrderList> list = new ArrayList<>();
			for (TChargingOrder tChargingOrder : orderList) {

			@@ -413,11 +413,10 @@
			@Override
			@GlobalTransactional(rollbackFor = Exception.class)//分布式事务
			public AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time) {
			if("SUCCESS".equals(refund_status)){
			TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
			one.setRefundStatus(2);
			one.setRefundSerialNumber(refund_id);
			one.setRefundTime(LocalDateTime.parse(success_time, DateTimeFormatter.ofPattern("yyyy-MM-DDTHH:mm:ss+TIMEZONE")));
			one.setRefundTime(LocalDateTime.now());
			shoppingOrderRefundService.updateById(one);
			//判断是否需要回退库存
			TShoppingOrder shoppingOrder = this.getById(one.getShoppingOrderId());
			@@ -464,7 +463,6 @@
			}finally {
			//解锁
			redisLock.unlock();
			}
			}
			}
			return AjaxResult.success();

	ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史