Merge remote-tracking branch 'origin/developer' into developerC

src/main/java/com/caimei/modules/order/service/CmRefundShopService.java

@@ -167,10 +167,11 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                     so.setRefundsAmount(0d);
                 }
                 //查询收款供应商退款金额
-                BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(so.getShopOrderID());
+                /*BigDecimal shopRefundAmount = cmRefundShopRecordDao.findShopRefund(so.getShopOrderID());
                 BigDecimal refundsAmount = MathUtil.add(so.getRefundsAmount(), shopRefundAmount);
-                so.setRefundsAmount(refundsAmount.doubleValue());
-                BigDecimal payAmount = MathUtil.sub(so.getPayedShopAmount(), refundsAmount);
+                so.setRefundsAmount(refundsAmount.doubleValue());*/
+                // 实际已付金额=已付金额-已退金额
+                BigDecimal payAmount = MathUtil.sub(so.getPayedShopAmount(), so.getRefundAmount());
                 refundAmount = MathUtil.add(refundAmount, payAmount).doubleValue();
                 List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
                 /*

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);
             for (CmMainReceiptExport bean : list) {
                 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()));
             }
             //返佣数据
@@ -277,7 +279,7 @@ public class CmDiscernReceiptController extends BaseController {
             List<CmReturnedPurchase> purchases = cmDiscernReceiptService.exportRefund(cmDiscernReceipt);
             for (CmReturnedPurchase purchase : purchases) {
                 String refundWay = "";
-                if (purchase.getReturnedWay().equals("1")) {
+                if ("1".equals(purchase.getReturnedWay())) {
                     if (purchase.getRefundBalanceFee() != null && purchase.getRefundBalanceFee() != 0) {
                         refundWay += "账户余额";
                     }