From 1d6cc84e046ff065f0b23699d34a8f65721e4fa3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 28 Oct 2019 10:21:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A9=BA=E8=B0=83=E8=B4=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=98=8E=E7=BB=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 9fb0a4286..ed19532d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -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()); }