|
|
|
@@ -282,7 +282,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
//@Transactional(rollbackFor = {Exception.class}) |
|
|
|
public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName,boolean writeComplate) { |
|
|
|
// 保存调整金额(预账单调整) |
|
|
|
boolean haspreview = false; |
|
|
|
@@ -738,8 +738,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
resultList.add(wxBillProperty); |
|
|
|
} |
|
|
|
//批量生成预账单 |
|
|
|
if(saveDb) { |
|
|
|
if(saveDb && resultList.size() > 0 ) { |
|
|
|
wxBillPropertyMapper.insertBills(resultList); |
|
|
|
//for (int i = 0 ; i < resultList.size() ; i++) { |
|
|
|
// wxBillPropertyMapper.insert(resultList.get(i)); |
|
|
|
//} |
|
|
|
} |
|
|
|
resultMap.put("billcount",billcount); |
|
|
|
resultMap.put("billList",resultList); |
|
|
|
@@ -847,7 +850,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
//@Transactional(rollbackFor = {Exception.class}) |
|
|
|
public List<WxBillProperty> buildProperty(WxMerchant wxMerchant,Long userId,WxPropertyContract propertyContract,Integer isPreview,boolean saveDb) { |
|
|
|
List<WxBillProperty> result = new ArrayList<>(); |
|
|
|
|
|
|
|
|