diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index b896a0144..ab7844c1c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -20,7 +20,7 @@ import com.jsowell.pile.service.IAdapayMemberAccountService; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberPlateNumberRelationService; import com.jsowell.pile.service.IOrderBasicInfoService; -import com.jsowell.pile.vo.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.service.OrderService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java index fd65dbe59..5d7fa9d4c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderInvoiceRecordController.java @@ -3,11 +3,17 @@ package com.jsowell.web.controller.pile; import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.core.domain.model.LoginUser; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderInvoiceRecord; +import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.service.IOrderInvoiceRecordService; +import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -34,6 +40,9 @@ public class OrderInvoiceRecordController extends BaseController { @Autowired private IOrderInvoiceRecordService orderInvoiceRecordService; + @Autowired + private IPileMerchantInfoService pileMerchantInfoService; + /** * 查询申请开票列表 */ @@ -42,6 +51,8 @@ public class OrderInvoiceRecordController extends BaseController { public TableDataInfo list(OrderInvoiceRecord orderInvoiceRecord) { startPage(); List list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord); + // GetInvoiceInfoDTO dto = new GetInvoiceInfoDTO(); + // List resultList = orderInvoiceRecordService.getInvoiceListWithAuth(dto); return getDataTable(list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GetInvoiceInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GetInvoiceInfoDTO.java new file mode 100644 index 000000000..727d09fc5 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GetInvoiceInfoDTO.java @@ -0,0 +1,42 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +import java.util.List; + +/** + * 查询发票列表DTO + * + * @author Lemon + * @Date 2023/8/21 13:50 + */ +@Data +public class GetInvoiceInfoDTO { + private Integer pageNum; + private Integer pageSize; + + /** + * 会员id + */ + private String memberId; + + /** + * 运营商id + */ + private String merchantId; + + /** + * 关联订单 + */ + private String orderCodes; + + /** + * 状态 + */ + private String status; + + /** + * 运营商部门id（权限校验） + */ + private List merchantDeptIds; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java index 23a74d26d..65ee248fd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java @@ -3,7 +3,6 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.vo.MemberPlateNumberVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java index 45a01dded..9d548cf1a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java @@ -3,7 +3,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberWalletLog; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.vo.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java index e8e18eaa2..543ce5911 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java @@ -2,6 +2,9 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderInvoiceRecord; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; +import com.jsowell.pile.dto.GetInvoiceInfoDTO; +import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -30,6 +33,13 @@ public interface OrderInvoiceRecordMapper { */ public List selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord); + /** + * 查询申请开票列表(带权限校验) + * @param dto + * @return + */ + List getInvoiceListWithAuth(@Param("dto") GetInvoiceInfoDTO dto); + /** * 新增申请开票 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index 5fb55678d..b9e3c76cc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -4,7 +4,7 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.PlatformTesterDTO; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.vo.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java index e144e8e56..87a14b5b0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java @@ -2,8 +2,6 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.vo.MemberPlateNumberVO; -import org.apache.ibatis.annotations.Param; /** * 用户车牌对应关系Service接口 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java index 1bc62d80d..d568889b6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java @@ -1,8 +1,10 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.OrderInvoiceRecord; +import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; import com.jsowell.pile.vo.web.InvoiceRecordVO; +import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; import java.time.LocalDateTime; import java.util.List; @@ -32,6 +34,13 @@ public interface IOrderInvoiceRecordService { */ List selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord); + /** + * 查询申请开票列表(带权限校验) + * @param dto + * @return + */ + List getInvoiceListWithAuth(GetInvoiceInfoDTO dto); + List selectInvoiceRecordList(QueryInvoiceRecordDTO memberId); List selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 18081af78..ad48c87f9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -19,7 +19,7 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.vo.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index 44ca0a173..69814d6c5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -1,8 +1,11 @@ package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.SecurityUtils; import com.jsowell.pile.domain.OrderInvoiceRecord; +import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; import com.jsowell.pile.mapper.OrderInvoiceRecordMapper; import com.jsowell.pile.service.IMemberInvoiceTitleService; @@ -11,10 +14,13 @@ import com.jsowell.pile.service.IOrderInvoiceRecordService; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.web.InvoiceRecordVO; +import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; /** @@ -81,6 +87,25 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService return orderInvoiceRecordMapper.selectOrderInvoiceRecordList(orderInvoiceRecord); } + /** + * 查询申请开票列表(带权限校验) + * @param dto + * @return + */ + @Override + public List getInvoiceListWithAuth(GetInvoiceInfoDTO dto) { + // 获取登录账号信息 + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + return new ArrayList<>(); + } + List merchantDeptIds = authorizedMap.getMerchantDeptIds(); + if (CollectionUtils.isNotEmpty(merchantDeptIds)) { + dto.setMerchantDeptIds(merchantDeptIds); + } + return orderInvoiceRecordMapper.getInvoiceListWithAuth(dto); + } + @Override public List selectInvoiceRecordList(QueryInvoiceRecordDTO dto) { return orderInvoiceRecordMapper.selectInvoiceRecordList(dto); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberBalanceVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java similarity index 83% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberBalanceVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java index 578761a16..4d2dbe314 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberBalanceVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo; +package com.jsowell.pile.vo.uniapp; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java index 7d4f086d6..0139d4cf6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo; +package com.jsowell.pile.vo.uniapp; import com.jsowell.common.annotation.Excel; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java new file mode 100644 index 000000000..d3637cebf --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java @@ -0,0 +1,27 @@ +package com.jsowell.pile.vo.web; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * TODO + * + * @author Lemon + * @Date 2023/8/21 13:26 + */ +@Data +public class OrderInvoiceRecordVO { + private String id; + private String memberId; + private String merchantId; + private String merchantName; + private String titleId; + private String email; + private String orderCodes; + private String status; + private BigDecimal totalAmount; + private BigDecimal totalServiceAmount; + private BigDecimal totalElecAmount; + +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml index 4583bb0d2..810579a2a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml @@ -72,7 +72,7 @@ order by t1.create_time desc - select member_id as memberId, principal_balance as principalAmount diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml index 634324556..945e1ca42 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml @@ -137,4 +137,32 @@ and create_time #{startTime,jdbcType=TIMESTAMP} + + + \ No newline at end of file diff --git a/jsowell-ui/src/views/billing/template/components/addBilling.vue b/jsowell-ui/src/views/billing/template/components/addBilling.vue index 9974e3fae..aa2b97ccb 100644 --- a/jsowell-ui/src/views/billing/template/components/addBilling.vue +++ b/jsowell-ui/src/views/billing/template/components/addBilling.vue @@ -190,7 +190,7 @@ - + - (/分钟) + (分钟) - + - (/分钟) + (元/分钟)
@@ -498,6 +498,8 @@ export default { servicePriceC: "", electricityPriceD: "", servicePriceD: "", + freeTime: null, + occupyFee: null, timeArray: [ { type: "1", @@ -637,6 +639,7 @@ export default { update() { this.$set(this.form, "billingTemplateId", this.billingTemplateId); updateBillingTemplate(this.form).then((response) => { + console.log("this.form", this.form); console.log("接口返回", response); this.$message.success("修改成功"); });