|
|
|
@@ -224,7 +224,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { |
|
|
|
v1.setType(1); |
|
|
|
v1.setReceivePayStr("1"); |
|
|
|
v1.setPayStr("0"); |
|
|
|
v1.setOweStr("0"); |
|
|
|
v1.setReceiveDate(new Date()); |
|
|
|
v1.setExpiredDay(0L); |
|
|
|
list.add(v1); |
|
|
|
@@ -233,7 +232,6 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { |
|
|
|
v2.setType(2); |
|
|
|
v2.setReceivePayStr("1000"); |
|
|
|
v2.setPayStr("0"); |
|
|
|
v2.setOweStr("1000"); |
|
|
|
v2.setReceiveDate(new Date()); |
|
|
|
v2.setExpiredDay(0L); |
|
|
|
list.add(v2); |
|
|
|
@@ -263,7 +261,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { |
|
|
|
return; |
|
|
|
} |
|
|
|
Integer type = billDaily.getType(); |
|
|
|
if (type != null) { |
|
|
|
if (type == null) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
logger.error("账单类型为空", billDaily.toString()); |
|
|
|
return; |
|
|
|
@@ -292,51 +290,57 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { |
|
|
|
logger.error("实收金额小于0", billDaily.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
String oweStr = billDaily.getOweStr(); |
|
|
|
if (StringUtils.isBlank(oweStr)) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
logger.error("欠缴金额为空", billDaily.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
double oweD = new BigDecimal(oweStr).doubleValue(); |
|
|
|
if (oweD < 0) { |
|
|
|
|
|
|
|
if (receivePayD < payD) { |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
logger.error("欠缴金额小于0", billDaily.toString()); |
|
|
|
logger.error("实际应收金额小于实收金额", billDaily.toString()); |
|
|
|
return; |
|
|
|
} |
|
|
|
long owe = new BigDecimal(oweD).multiply(new BigDecimal(100)).longValue(); |
|
|
|
billDaily.setOwe(owe); |
|
|
|
|
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
|
|
|
|
long receivePay = new BigDecimal(receivePayD).multiply(new BigDecimal(100)).longValue(); |
|
|
|
wxBillDaily.setReceivePay(receivePay); |
|
|
|
|
|
|
|
long pay = new BigDecimal(payD).multiply(new BigDecimal(100)).longValue(); |
|
|
|
wxBillDaily.setPay(pay); |
|
|
|
|
|
|
|
wxBillDaily.setOwe(receivePay - pay); |
|
|
|
wxBillDaily.setType(type); |
|
|
|
Date receiveDate = billDaily.getReceiveDate(); |
|
|
|
wxBillDaily.setReceiveDate(receiveDate); |
|
|
|
Date date = new Date(); |
|
|
|
if (pay > 0) { |
|
|
|
wxBillDaily.setPayDate(date); |
|
|
|
} |
|
|
|
int expiredDay = DateUtils.daysBetween(receiveDate, date); |
|
|
|
billDaily.setExpiredDay((long) expiredDay); |
|
|
|
wxBillDaily.setExpiredDay((long) expiredDay); |
|
|
|
if (expiredDay > 0) { |
|
|
|
billDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
wxBillDaily.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
} else { |
|
|
|
billDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); |
|
|
|
wxBillDaily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); |
|
|
|
} |
|
|
|
if (receivePayD == payD) { |
|
|
|
billDaily.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
|
wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
|
} |
|
|
|
|
|
|
|
billDaily.setUserId(user.getId()); |
|
|
|
billDaily.setShopId(wxShop.getId()); |
|
|
|
billDaily.setRentShopType(wxShop.getType()); |
|
|
|
billDaily.setPayWay(EnumBillPayWay.OTHER.getCode()); |
|
|
|
billDaily.setCreatetime(date); |
|
|
|
billDaily.setUpdatetime(date); |
|
|
|
|
|
|
|
wxBillDaily.setUserId(user.getId()); |
|
|
|
wxBillDaily.setShopId(wxShop.getId()); |
|
|
|
wxBillDaily.setRentShopType(wxShop.getType()); |
|
|
|
wxBillDaily.setPayWay(EnumBillPayWay.OTHER.getCode()); |
|
|
|
wxBillDaily.setCreatetime(date); |
|
|
|
wxBillDaily.setUpdatetime(date); |
|
|
|
wxBillDaily.setIsDel(EnumDelStatus.NOT_DEL.getCode()); |
|
|
|
//商户 |
|
|
|
WxMerchantShop merchantShop = new WxMerchantShop(); |
|
|
|
merchantShop.setShopId(wxShop.getId()); |
|
|
|
merchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); |
|
|
|
WxMerchantShop wxMerchantShop = wxMerchantShopMapper.selectOne(merchantShop); |
|
|
|
billDaily.setMerchantId(wxMerchantShop.getMerchantId()); |
|
|
|
wxBillDaily.setMerchantId(wxMerchantShop.getMerchantId()); |
|
|
|
|
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
billDaily.setId(idWorker.nextId()); |
|
|
|
wxBillDailyMapper.insertSelective(billDaily); |
|
|
|
wxBillDaily.setId(idWorker.nextId()); |
|
|
|
wxBillDailyMapper.insertSelective(wxBillDaily); |
|
|
|
|
|
|
|
//记数 |
|
|
|
stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); |
|
|
|
|