Merge remote-tracking branch 'origin/master'

This commit is contained in:
2024-12-16 14:33:14 +08:00
2 changed files with 2 additions and 0 deletions

View File

@@ -19,4 +19,5 @@ public class ReviewDetailsVo {
private ReviewInvoice invoice = new ReviewInvoice(); //发票信息
private List<ReviewDiscount> discounts; //优惠详情
private List<ReviewRecord> records; //操作记录
private String useOrgSid;
}

View File

@@ -512,6 +512,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
ReviewDetailsVo vo = new ReviewDetailsVo();
vo.setSid(sid);
SmsSalesBill smsSalesBill = fetchBySid(sid);
vo.setUseOrgSid(smsSalesBill.getUseOrgSid());
List<SmsSalesBillDetail> goods = smsSalesBillDetailService.selByBillSid(sid);
if (!goods.isEmpty()) {
List<ReviewGoods> reviewGoods = new ArrayList<>();