|
|
@ -138,7 +138,12 @@ public class CashCollectionServiceImpl implements CashCollectionService { |
|
|
cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket()); |
|
|
cashRecord.setSubmitterMarket(cashCollection.getSubmitterMarket()); |
|
|
cashRecord.setOrderType(1); //订单类型:1-收款 |
|
|
cashRecord.setOrderType(1); //订单类型:1-收款 |
|
|
cashRecord.setMarket(cashCollection.getMarket()); |
|
|
cashRecord.setMarket(cashCollection.getMarket()); |
|
|
cashRecord.setPerformanceMarket(Integer.valueOf(areaInfo.getArea())); |
|
|
|
|
|
|
|
|
if(areaInfo.getArea().equals("0")){ |
|
|
|
|
|
cashRecord.setPerformanceMarket(Integer.valueOf(cashCollection.getMarket())); |
|
|
|
|
|
}else { |
|
|
|
|
|
cashRecord.setPerformanceMarket(Integer.valueOf(areaInfo.getArea())); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//地区,根据 jwcode 插入 |
|
|
//地区,根据 jwcode 插入 |
|
|
//cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode())); |
|
|
//cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(cashRecord.getJwcode())); |
|
|
//插入新收款订单 |
|
|
//插入新收款订单 |
|
|
|