Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardDeptTotalVo.java

@@ -48,4 +48,10 @@ public class HardDeptTotalVo {
     @Schema(description = "退款次数")
     private Long orderRefundCont = 0L;
 
+    /**
+     * 导出相关
+     */
+    @Schema(description = "列号")
+    private Long lineNumber;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java

@@ -39,4 +39,10 @@ public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
     @Schema(description = "总消费次数")
     private BigDecimal totalPayCount;
 
+    /**
+     * 导出相关
+     */
+    @Schema(description = "列号")
+    private Long lineNumber;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderSbVo.java

@@ -38,5 +38,11 @@ public class HardOrderSbVo implements BaseMchInterface, BaseHardInterface {
 
     @Schema(description = "总消费次数")
     private BigDecimal totalPayCount;
+    
+    /**
+     * 导出相关
+     */
+    @Schema(description = "列号")
+    private Long lineNumber;
 
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/excel/HardOrderExcelVo.java

@@ -3,6 +3,7 @@ package com.bsd.pjcloud.hard.api.vo.order.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -41,4 +42,10 @@ public class HardOrderExcelVo {
     @ExcelProperty("订单支付时间")
     private LocalDateTime payTime;
 
+    /**
+     * 导出相关
+     */
+    @Schema(description = "列号")
+    private Long lineNumber;
+
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -172,7 +172,10 @@ public class HardOrderController {
                 BigDecimal totalPriceSum = BigDecimal.ZERO;
                 BigDecimal extraPriceSum = BigDecimal.ZERO;
                 BigDecimal payPriceSum = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (HardOrderExcelVo v : excelList) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getTotalPrice())) {
                         totalPriceSum = totalPriceSum.add(BigDecimal.valueOf(v.getTotalPrice()));
                         v.setTotalPrice(BigDecimal.valueOf(v.getTotalPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue());

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java

@@ -84,7 +84,10 @@ public class HardOrderTotalController {
             if (ObjectUtil.isNotEmpty(list)) {
                 BigDecimal priceTotal = BigDecimal.ZERO;
                 BigDecimal countTotal = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (HardOrderSbVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getHardType())) {
                         v.setHardType(HardTypeEnum.valueOfByType(v.getHardType()).getDescription());
                     }
@@ -124,7 +127,10 @@ public class HardOrderTotalController {
             if (ObjectUtil.isNotEmpty(list)) {
                 BigDecimal priceTotal = BigDecimal.ZERO;
                 BigDecimal countTotal = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (HardOrderCsVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getHardType())) {
                         v.setHardType(HardTypeEnum.valueOfByType(v.getHardType()).getDescription());
                     }
@@ -177,7 +183,11 @@ public class HardOrderTotalController {
                 BigDecimal orderPayCountSum = BigDecimal.ZERO;
                 BigDecimal orderRefundPriceSum = BigDecimal.ZERO;
                 BigDecimal orderRefundContSum = BigDecimal.ZERO;
+
+                Long lineNumber = 1L;
                 for (HardDeptTotalVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     // 批量充值
                     if (ObjectUtil.isNotEmpty(v.getWalletPrice())) {
                         walletPriceSum = walletPriceSum.add(BigDecimal.valueOf(v.getWalletPrice()));

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java

@@ -34,4 +34,9 @@ public class WalletManageVo extends WalletManageEntity implements BaseUserInterf
      * 部门相关
      */
     private String deptName;
+
+    /**
+     * 导出相关
+     */
+    private Long lineNumber;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java

@@ -56,4 +56,9 @@ public class WalletRechargeImportVo extends WalletRechargeImportEntity implement
     private String priceStr;
 
     private String importTimeStr;
+
+    /**
+     * 导出相关
+     */
+    private Long lineNumber;
 }

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java

@@ -92,4 +92,9 @@ public class WalletTransactionVo extends WalletTransactionEntity implements Base
 
     private LocalDateTime orderPayTime;
 
+    /**
+     * 导出相关
+     */
+    private Long lineNumber;
+
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java

@@ -163,7 +163,6 @@ public class WalletTransactionController {
     @PreAuthorize("@pms.hasPermission('wallet_walletTransaction_export')")
     public void exportCz(HttpServletResponse response, @RequestBody WalletTransactionDto dto) {
         dto.setBizTypes(WalletBizEnum.getTopUpCodes());
-        // dto.setType(WalletTransactionDto.TYPE_INCOME);
         List<WalletTransactionVo> list = walletTransactionService.scopeList(dto, DataScope.of());
         walletTransactionService.exportByTemplate(response, dto, "file/个人充值明细.xlsx", list);
     }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java

@@ -129,7 +129,10 @@ public class WalletRechargeImportController {
             }
             if (ObjectUtil.isNotEmpty(list)) {
                 BigDecimal priceStrSum = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (WalletRechargeImportVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getPrice())) {
                         if (ObjectUtil.equals(v.getBizType(), WalletBizRechargeEnum.REDUCTION.getCode()) && v.getPrice() > 0) {
                             v.setPrice(v.getPrice() * -1);

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java

@@ -283,7 +283,10 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
                 BigDecimal balanceSum = BigDecimal.ZERO;
                 BigDecimal totalExpenseSum = BigDecimal.ZERO;
                 BigDecimal totalRechargeSum = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (WalletManageVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getBalance())) {
                         balanceSum = balanceSum.add(BigDecimal.valueOf(v.getBalance()));
                         v.setBalance(BigDecimal.valueOf(v.getBalance()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).intValue());

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java

@@ -212,7 +212,10 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
             }
             if (ObjectUtil.isNotEmpty(list)) {
                 BigDecimal priceTotal = BigDecimal.ZERO;
+                Long lineNumber = 1L;
                 for (WalletTransactionVo v : list) {
+                    v.setLineNumber(lineNumber);
+                    lineNumber++;
                     if (ObjectUtil.isNotEmpty(v.getPrice())) {
                         priceTotal = priceTotal.add(BigDecimal.valueOf(v.getPrice()));
                         v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());