diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 59b1e57fc..76049f536 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -287,7 +287,7 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="主物账单ID(针对合同里面的自定义科目账单)",name="parentBillId") public Long parentBillId; - @io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用)",name="virtualComposeId") + @io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用,主账单用)",name="virtualComposeId") public Long virtualComposeId; @io.swagger.annotations.ApiModelProperty(value="父虚拟组合ID(针对店铺拆分,自定义科目账单用)",name="parentVirtualComposeId") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index d1cc81bb1..c585320d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -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); } diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 5c7574910..9c3c49074 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -249,7 +249,9 @@ sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay, sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay, starttime, - endtime + endtime, + receive_date, + virtual_compose_id from wx_all_bill group by starttime,endtime