|
|
|
@@ -1289,6 +1289,20 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
daily.setExpiredDay(expiredDayAndStatus.getExpiredDay()); |
|
|
|
daily.setStatus(expiredDayAndStatus.getStatus()); |
|
|
|
daily.setBuildWay(EnumBillDailyBuildWay.IMPORT.getCode()); |
|
|
|
JSONArray priceDetals = new JSONArray(); |
|
|
|
JSONObject priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "price"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "way"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "unit"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
daily.setPriceDetail(JSONArray.toJSONString(priceDetals)); |
|
|
|
wxBillDailyMapper.insert(daily); |
|
|
|
if (pay > 0) { |
|
|
|
addActionImport(daily.getId(), bill.getPayWay(), bill.getPayDate(), user, bill.getPayStr()); |
|
|
|
@@ -1552,21 +1566,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
wxBillDaily.setId(businessId); |
|
|
|
wxBillDaily.setReceivePay(newPrice); |
|
|
|
wxBillDaily.setOwe(newPrice + dbBill.getServiceChargePay() - dbBill.getPay()); |
|
|
|
|
|
|
|
JSONArray priceDetals = new JSONArray(); |
|
|
|
JSONObject priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "price"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "way"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
priceDetal = new JSONObject(); |
|
|
|
priceDetal.put("key", "unit"); |
|
|
|
priceDetal.put("value", 0); |
|
|
|
priceDetals.add(priceDetal); |
|
|
|
wxBillDaily.setPriceDetail(JSONArray.toJSONString(priceDetals)); |
|
|
|
if (newPrice.equals(dbBill.getPay())) { |
|
|
|
wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); |
|
|
|
} |
|
|
|
|