|
|
|
@@ -1062,6 +1062,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
Long sid = shopIdList.get(g); |
|
|
|
WxAllBill rs = new WxAllBill(); |
|
|
|
setNewsBills(wxPropertyContract, rs, rb, sid, shopAreaRateMap,shopUserMap); |
|
|
|
//属于同一个分组 |
|
|
|
rs.setVirtualComposeId(rb.getId()); |
|
|
|
shopAllBillList.add(rs); |
|
|
|
|
|
|
|
@@ -1072,6 +1073,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
WxAllBill ufbn = new WxAllBill(); |
|
|
|
setNewsBills(wxPropertyContract, ufbn, ufb, sid, shopAreaRateMap,shopUserMap); |
|
|
|
ufbn.setParentBillId(rs.getId()); |
|
|
|
//父级分组 |
|
|
|
ufbn.setParentVirtualComposeId(rb.getId()); |
|
|
|
shopAllBillList.add(ufbn); |
|
|
|
} |
|
|
|
|