Jelajahi Sumber

bugfix-收款表导出

Aslee 3 tahun lalu
induk
melakukan
e592afa89b

+ 8 - 6
src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -249,12 +249,14 @@ public class CmDiscernReceiptController extends BaseController {
             List<CmMainReceiptExport> list = cmDiscernReceiptService.exportTest(cmDiscernReceipt);
             List<CmMainReceiptExport> list = cmDiscernReceiptService.exportTest(cmDiscernReceipt);
             for (CmMainReceiptExport bean : list) {
             for (CmMainReceiptExport bean : list) {
                 String productNames = bean.getProductNames();
                 String productNames = bean.getProductNames();
-                String[] productNameArr = productNames.split(",");
-                for (int i = 0; i < productNameArr.length; i++) {
-                    productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
-                    productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
+                if (StringUtils.isNotEmpty(productNames)) {
+                    String[] productNameArr = productNames.split(",");
+                    for (int i = 0; i < productNameArr.length; i++) {
+                        productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
+                        productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
+                    }
+                    bean.setProductNames(productNames);
                 }
                 }
-                bean.setProductNames(productNames);
                 bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
                 bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
             }
             }
             //返佣数据
             //返佣数据
@@ -277,7 +279,7 @@ public class CmDiscernReceiptController extends BaseController {
             List<CmReturnedPurchase> purchases = cmDiscernReceiptService.exportRefund(cmDiscernReceipt);
             List<CmReturnedPurchase> purchases = cmDiscernReceiptService.exportRefund(cmDiscernReceipt);
             for (CmReturnedPurchase purchase : purchases) {
             for (CmReturnedPurchase purchase : purchases) {
                 String refundWay = "";
                 String refundWay = "";
-                if (purchase.getReturnedWay().equals("1")) {
+                if ("1".equals(purchase.getReturnedWay())) {
                     if (purchase.getRefundBalanceFee() != null && purchase.getRefundBalanceFee() != 0) {
                     if (purchase.getRefundBalanceFee() != null && purchase.getRefundBalanceFee() != 0) {
                         refundWay += "账户余额";
                         refundWay += "账户余额";
                     }
                     }