update 后管计费模板页面

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;

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<OrderInvoiceRecord> list = orderInvoiceRecordService.selectOrderInvoiceRecordList(orderInvoiceRecord);
+		// GetInvoiceInfoDTO dto = new GetInvoiceInfoDTO();
+		// List<OrderInvoiceRecordVO> resultList = orderInvoiceRecordService.getInvoiceListWithAuth(dto);
 		return getDataTable(list);
 	}
 

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<String> merchantDeptIds;
+}

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;
 

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;

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<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
 
+	/**
+	 * 查询申请开票列表(带权限校验)
+	 * @param dto
+	 * @return
+	 */
+	List<OrderInvoiceRecordVO> getInvoiceListWithAuth(@Param("dto") GetInvoiceInfoDTO dto);
+
 	/**
 	 * 新增申请开票
 	 *

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;

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接口

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<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
 
+	/**
+	 *	查询申请开票列表(带权限校验)
+	 * @param dto
+	 * @return
+	 */
+	List<OrderInvoiceRecordVO> getInvoiceListWithAuth(GetInvoiceInfoDTO dto);
+
 	List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO memberId);
 
 	List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime);

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;

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<OrderInvoiceRecordVO> getInvoiceListWithAuth(GetInvoiceInfoDTO dto) {
+		// 获取登录账号信息
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		if (authorizedMap == null) {
+			return new ArrayList<>();
+		}
+		List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
+		if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
+			dto.setMerchantDeptIds(merchantDeptIds);
+		}
+		return orderInvoiceRecordMapper.getInvoiceListWithAuth(dto);
+	}
+
 	@Override
 	public List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto) {
 		return orderInvoiceRecordMapper.selectInvoiceRecordList(dto);

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;
 

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;

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;
+
+}

jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml

@@ -72,7 +72,7 @@
         order by t1.create_time desc
     </select>
 
-    <select id="getMemberRefundAmount" resultType="com.jsowell.pile.vo.MemberBalanceVO">
+    <select id="getMemberRefundAmount" resultType="com.jsowell.pile.vo.uniapp.MemberBalanceVO">
         select
             member_id as memberId,
             principal_balance as principalAmount

jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml

@@ -137,4 +137,32 @@
             and create_time <![CDATA[ <= ]]> #{startTime,jdbcType=TIMESTAMP}
         </if>
     </select>
+
+    <select id="getInvoiceListWithAuth" resultType="com.jsowell.pile.vo.web.OrderInvoiceRecordVO">
+        SELECT
+            t1.id,
+            t1.member_id as memberId,
+            t1.merchant_id as merchantId,
+            t2.merchant_name as merchantName,
+            t1.title_id as titleId,
+            t1.email as email,
+            t1.order_codes as orderCodes,
+            t1.STATUS as status,
+            t1.total_amount as totalAmount,
+            t1.total_service_amount as totalServiceAmount,
+            t1.total_elec_amount  as totalElecAmount
+        FROM
+            order_invoice_record t1
+                LEFT JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id  and t1.del_flag = '0'
+        where t2.dept_id in
+        <foreach collection="dto.merchantDeptIds" item="deptId" open="(" separator="," close=")">
+            #{deptId,jdbcType=VARCHAR}
+        </foreach>
+        <if test="dto.memberId != null  and dto.memberId != ''"> and t1.member_id = #{dto.memberId}</if>
+        <if test="dto.merchantId != null  and dto.merchantId != ''"> and t1.merchant_id = #{dto.merchantId}</if>
+        <if test="dto.orderCodes != null  and dto.orderCodes != ''"> and t1.order_codes like concat('%', #{dto.orderCodes}, '%')</if>
+        <if test="dto.status != null  and dto.status != ''"> and t1.status = #{dto.status}</if>
+
+    </select>
+
 </mapper>

jsowell-ui/src/views/billing/template/components/addBilling.vue

@@ -190,7 +190,7 @@
                 <el-divider />
                 <el-row :gutter="20">
                     <el-col :span="10">
-                        <el-form-item label="站桩免费时长" prop="freeTime">
+                        <el-form-item label="占桩免费时长" prop="freeTime">
                             <el-input
                                 v-model="form.freeTime"
                                 type="text"
@@ -199,18 +199,18 @@
                             />
                         </el-form-item>
                     </el-col>
-                    <span class="time"> (/分钟)</span>
+                    <span class="time"> (分钟)</span>
                     <el-col :span="11" class="cols">
-                        <el-form-item label="站桩费率" prop="stationRate">
+                        <el-form-item label="占桩费率" prop="occupyFee">
                             <el-input
-                                v-model="form.stationRate"
+                                v-model="form.occupyFee"
                                 placeholder="0"
                                 clearable
                                 type="text"
                             />
                         </el-form-item>
                     </el-col>
-                    <span class="min"> (/分钟)</span>
+                    <span class="min"> (元/分钟)</span>
                 </el-row>
             </div>
             <div v-else>
@@ -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("修改成功");
             });