|
|
|
@@ -362,7 +362,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
if (null == shopId) { |
|
|
|
shopId = be.getShopId(); |
|
|
|
} |
|
|
|
if (shopId != be.getShopId()) { |
|
|
|
if (shopId.longValue() != be.getShopId().longValue()) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"多个房源合并收款不能冲抵"); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -1223,13 +1223,17 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
WxAllBill advanceBill = new WxAllBill(); |
|
|
|
advanceBill.updateTenantInfo(record); |
|
|
|
advanceBill.setShopId(wxShop.getId()); |
|
|
|
WxShopUsers su = new WxShopUsers(); |
|
|
|
su.updateTenantInfo(record); |
|
|
|
su.setShopId(wxShop.getId()); |
|
|
|
su.setStatus(EnumShopUsersStatus.LIVE.getCode()); |
|
|
|
WxShopUsers wsu = wxShopService.getOneShopUsers(su); |
|
|
|
if (null != wsu) { |
|
|
|
advanceBill.setCusName(wsu.getName()); |
|
|
|
if (StringUtils.isNotBlank(record.getCusName())) { |
|
|
|
advanceBill.setCusName(record.getCusName()); |
|
|
|
}else { |
|
|
|
WxShopUsers su = new WxShopUsers(); |
|
|
|
su.updateTenantInfo(record); |
|
|
|
su.setShopId(wxShop.getId()); |
|
|
|
su.setStatus(EnumShopUsersStatus.LIVE.getCode()); |
|
|
|
WxShopUsers wsu = wxShopService.getOneShopUsers(su); |
|
|
|
if (null != wsu) { |
|
|
|
advanceBill.setCusName(wsu.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
advanceBill.setNeedPay(record.getReceivePay()); |
|
|
|
advanceBill.setReceivePay(receivePay); |
|
|
|
@@ -1237,7 +1241,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
advanceBill.setUseMoney("0"); |
|
|
|
advanceBill.setBillType(billType.getCode()); |
|
|
|
//advanceBill.setPayWay(); |
|
|
|
advanceBill.setPayDate(new Date()); |
|
|
|
//advanceBill.setPayDate(new Date()); |
|
|
|
advanceBill.setStarttime(starttime); |
|
|
|
advanceBill.setEndtime(endtime); |
|
|
|
advanceBill.setReceiveDate(starttime); |
|
|
|
|