Browse Source

no message

FengChaoYu 8 months ago
parent
commit
7b2b7209af

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesBean.java

@@ -21,6 +21,9 @@ public class WebsitPartsSalesBean extends WebsitPartsSales {
     @ApiModelProperty(value = "支付记录列表", required = true)
     private List<WebsitSalesPayOrder> payList;
 
+    @ApiModelProperty(value = "支付记录列表", required = true)
+    private List<WebsitSalesPayOrder> allPayList;
+
     @ApiModelProperty(value = "订单明细使用信息", required = true)
     private List<OldRefundManageRecordBean> oldRefundManageRecordBeanList;
 }

+ 6 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -365,13 +365,19 @@ public class WebsitPartsSalesOrderLogic {
                 .eq(WebsitSalesPayOrder::getPayFlag, IsYesNoEnum.YES.getKey())
                 .eq(WebsitSalesPayOrder::getOrderId, partsSalesOrderBean.getId())
                 .list();
+        List<WebsitSalesPayOrder> allPayList = websitSalesPayOrderService.lambdaQuery()
+                .eq(WebsitSalesPayOrder::getCompanyWechatId, partsSalesOrder.getCompanyWechatId())
+                .eq(WebsitSalesPayOrder::getOrderId, partsSalesOrderBean.getId())
+                .list();
 
         partsSalesOrderBean.setPayList(payList);
+        partsSalesOrderBean.setAllPayList(allPayList);
 
         // 配件使用记录
         List<OldRefundManageRecordBean> oldRefundManageRecordBeans = materialMapper.queryOldRefundRecordById(partsSalesOrder.getId());
         partsSalesOrderBean.setOldRefundManageRecordBeanList(oldRefundManageRecordBeans);
 
+
         return partsSalesOrderBean;
     }