| @@ -111,27 +111,25 @@ public class BillDailyAsyncTask { | |||||
| } | } | ||||
| String receivePayStr = vo.getReceivePayStr(); | String receivePayStr = vo.getReceivePayStr(); | ||||
| double receivePayD = new BigDecimal(receivePayStr).doubleValue(); | |||||
| if (receivePayD <= 0) { | |||||
| long receivePay = new BigDecimal(receivePayStr).multiply(new BigDecimal(100)).longValue(); | |||||
| if (receivePay <= 0) { | |||||
| logger.error("实际应收金额小于等于0", vo.toString()); | logger.error("实际应收金额小于等于0", vo.toString()); | ||||
| fail++; | fail++; | ||||
| continue; | continue; | ||||
| } | } | ||||
| String payStr = vo.getPayStr(); | String payStr = vo.getPayStr(); | ||||
| double payD = new BigDecimal(payStr).doubleValue(); | |||||
| if (payD < 0) { | |||||
| long pay = new BigDecimal(payStr).multiply(new BigDecimal(100)).longValue(); | |||||
| if (pay < 0) { | |||||
| logger.error("实收金额小于0", vo.toString()); | logger.error("实收金额小于0", vo.toString()); | ||||
| fail++; | fail++; | ||||
| continue; | continue; | ||||
| } | } | ||||
| if (receivePayD < payD) { | |||||
| if (receivePay < pay) { | |||||
| logger.error("实际应收金额小于实收金额", vo.toString()); | logger.error("实际应收金额小于实收金额", vo.toString()); | ||||
| fail++; | fail++; | ||||
| continue; | continue; | ||||
| } | } | ||||
| long receivePay = new BigDecimal(receivePayD).multiply(new BigDecimal(100)).longValue(); | |||||
| vo.setReceivePay(receivePay); | vo.setReceivePay(receivePay); | ||||
| long pay = new BigDecimal(payD).multiply(new BigDecimal(100)).longValue(); | |||||
| vo.setPay(pay); | vo.setPay(pay); | ||||
| vo.setTenantId(tenantId); | vo.setTenantId(tenantId); | ||||
| vo.setShopId(wxShop.getId()); | vo.setShopId(wxShop.getId()); | ||||