diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java index 993bab4f5..6b7385852 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java @@ -1,7 +1,6 @@ package com.jsowell.api.uniapp; import com.alibaba.fastjson2.JSON; -import com.google.common.collect.ImmutableMap; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.PageResponse; @@ -9,17 +8,16 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.dto.QueryOccupyOrderDTO; -import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.OrderPileOccupyService; +import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.Objects; +import java.util.Map; /** * 占桩订单controller @@ -119,10 +117,12 @@ public class OccupyOrderController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); logger.info("查询用户: {} 是否有未支付的占桩订单", memberId); - OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId); - if (Objects.nonNull(orderPileOccupy)) { - response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode())); - } + // OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId); + // if (Objects.nonNull(orderPileOccupy)) { + // response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode())); + // } + Map map = orderPileOccupyService.queryUnPayOrder(memberId); + response = new RestApiResponse<>(map); } catch (Exception e) { logger.error("查询用户是否有未支付的占桩订单 error,", e); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 048876f54..724bd5952 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -329,4 +329,6 @@ public interface OrderBasicInfoMapper { List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto); + + List queryRepayOrder(String memberId); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index 1e86b608a..aa381abba 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -394,4 +394,5 @@ public interface OrderBasicInfoService{ */ List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); + List queryRepayOrder(String memberId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java index 0c8519cf6..6f67e72d9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java @@ -81,6 +81,8 @@ public interface OrderPileOccupyService{ Map payOccupyPileOrder(PayOrderDTO dto); + Map queryUnPayOrder(String memberId); + /** * 查询占桩订单列表 * @param dto diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 0b7fa425d..04e727c65 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3523,6 +3523,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { return orderBasicInfoMapper.getOrderInfoByNXJT(dto); } + @Override + public List queryRepayOrder(String memberId) { + return orderBasicInfoMapper.queryRepayOrder(memberId); + } + @Override public int deleteByPrimaryKey(Integer id) { return orderBasicInfoMapper.deleteByPrimaryKey(id); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index ac56f6731..2247fd2ed 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -20,6 +20,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; +import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand; import com.jsowell.pile.dto.*; @@ -353,6 +354,21 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId); } + @Override + public Map queryUnPayOrder(String memberId) { + Map resultMap = Maps.newHashMap(); + OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId); + if (orderPileOccupy != null) { + resultMap.put("occupyCode", orderPileOccupy.getOccupyCode()); + } + List orderList = orderBasicInfoService.queryRepayOrder(memberId); + if (CollectionUtils.isNotEmpty(orderList)) { + List orderCodeList = orderList.stream().map(OrderBasicInfo::getOrderCode).collect(Collectors.toList()); + resultMap.put("occupyCode", orderCodeList); + } + return resultMap; + } + /** * 查询占桩订单列表 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 0cb4c0692..2e58f14ab 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -94,8 +94,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { balancePayOrderV2(dto); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 2023-07-11 全部改为汇付支付 - dto.setGoodsTitle("充电费用"); - dto.setGoodsDesc("充电桩预付款金额"); + String goodsTitle = "充电费用"; + String goodsDesc = "充电桩预付款金额"; + if (StringUtils.equals(orderInfo.getPayStatus(), OrderPayStatusEnum.repay.getValue())) { + goodsTitle = "补缴费用"; + goodsDesc = dto.getOrderCode() + "订单补缴金额"; + } + dto.setGoodsTitle(goodsTitle); + dto.setGoodsDesc(goodsDesc); dto.setType(ScenarioEnum.ORDER.getValue()); Map weixinMap = onlinePaymentOrder(dto); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 70e27b6ad..7fac0f361 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2779,5 +2779,10 @@ - + \ No newline at end of file