From 13e3a4f7b66f15e399882480d72a6cfb5fea8631 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 9 Aug 2022 16:20:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 759db9e2..ac071f89 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -343,7 +343,9 @@ public class HighOrderServiceImpl implements HighOrderService { "抵扣积分订单：" + highOrder.getOrderNo() + "，使用积分:" + highOrder.getPayGold()); highOrder.setOrderStatus(OrderStatusEnum.type3.getType()); + highOrder.setPayablePrice(highOrder.getPayPrice()); highOrder.setPayTime(new Date()); + for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) { childOrder.setChildOrdeStatus(3); } From 5e9230c9dda348960dae03b1a1ef957229d6d44c Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 9 Aug 2022 17:23:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cweb/controller/HighOrderController.java | 4 +-- .../java/com/hai/dao/HighOrderMapperExt.java | 3 +++ .../java/com/hai/model/GasOrderModel.java | 27 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java index 97ea9369..9bc5cf8c 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -327,8 +327,8 @@ public class HighOrderController { childOrder.setGoodsActualPrice(childOrder.getGoodsPrice()); // 油价信息 childOrder.setGasPriceGun(priceModel.getPriceGun()); - childOrder.setGasPriceVip(priceModel.getPriceVip()); - childOrder.setGasPriceOfficial(priceModel.getPriceOfficial()); + childOrder.setGasPriceVip(priceModel.getPriceGun()); + childOrder.setGasPriceOfficial(new BigDecimal("0")); childOrder.setGasPricePlatform(priceModel.getPriceVip()); childOrder.setGasOilLiters(priceModel.getOilLiters()); childOrder.setGasDiscount(new BigDecimal("0")); diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java index 0850af7d..ac3efd3b 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java @@ -1154,9 +1154,12 @@ public interface HighOrderMapperExt { " b.id orderId," + " b.order_no orderNo," + " a.gas_order_no gasOrderNo," + + " b.mem_discount_name memDiscountName," + " b.pay_type payType," + " b.total_price totalPrice," + " b.deduction_price deductionPrice," + + " b.payable_price payablePrice," + + " b.pay_gold payGold," + " b.pay_real_price payRealPrice," + " b.order_status status," + " REPLACE(b.mem_phone, SUBSTR(b.mem_phone,4,4), '****') merPhone," + diff --git a/hai-service/src/main/java/com/hai/model/GasOrderModel.java b/hai-service/src/main/java/com/hai/model/GasOrderModel.java index fb068d8d..e2f1a538 100644 --- a/hai-service/src/main/java/com/hai/model/GasOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/GasOrderModel.java @@ -12,9 +12,12 @@ public class GasOrderModel { private Long orderId; private String orderNo; private String gasOrderNo; + private String memDiscountName; private Integer payType; private BigDecimal totalPrice; private BigDecimal deductionPrice; + private BigDecimal payablePrice; + private BigDecimal payGold; private BigDecimal payRealPrice; private Integer status; private String merPhone; @@ -39,6 +42,30 @@ public class GasOrderModel { private Boolean printStatus; private Integer printNum; + public BigDecimal getPayablePrice() { + return payablePrice; + } + + public void setPayablePrice(BigDecimal payablePrice) { + this.payablePrice = payablePrice; + } + + public BigDecimal getPayGold() { + return payGold; + } + + public void setPayGold(BigDecimal payGold) { + this.payGold = payGold; + } + + public String getMemDiscountName() { + return memDiscountName; + } + + public void setMemDiscountName(String memDiscountName) { + this.memDiscountName = memDiscountName; + } + public String getGasStaffName() { return gasStaffName; } From 738bb246909353126ce73b1fd16bfc1f41940382 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 9 Aug 2022 18:07:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/controller/HighOrderController.java | 4 ++-- .../src/main/java/com/hai/schedule/HighGasSchedule.java | 5 +++++ .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java index 9bc5cf8c..443ae707 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java @@ -329,13 +329,13 @@ public class HighOrderController { childOrder.setGasPriceGun(priceModel.getPriceGun()); childOrder.setGasPriceVip(priceModel.getPriceGun()); childOrder.setGasPriceOfficial(new BigDecimal("0")); - childOrder.setGasPricePlatform(priceModel.getPriceVip()); + childOrder.setGasPricePlatform(priceModel.getPriceGun()); childOrder.setGasOilLiters(priceModel.getOilLiters()); childOrder.setGasDiscount(new BigDecimal("0")); childOrder.setExt1(childOrder.getGasPricePlatform().toString()); childOrder.setGasOilSubsidy(new BigDecimal("0")); childOrder.setGasLitersPreferences(new BigDecimal("0")); - childOrder.setGasPricePreferences(priceModel.getPriceVip()); + childOrder.setGasPricePreferences(priceModel.getPriceGun()); } else { // 支付价格 childOrder.setGoodsActualPrice(priceModel.getPayPrice()); diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java index 6f52eb2b..8e8b94c6 100644 --- a/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java +++ b/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java @@ -156,6 +156,11 @@ public class HighGasSchedule { gasService.getJiaHaoYouAllStation(); } + @Scheduled(cron = "0 1 0 * * ?") //每日凌晨12点01分执行一次 + public void getJinZhuAllStation() throws Exception { + gasService.getJinZhuAllStation(); + } + /* @Scheduled(cron = "0 30 7 * * ?") //每日7点1分执行一次 public void refreshPriceOfficial() throws Exception { gasOilPriceOfficialService.refreshPriceOfficial(); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index ac071f89..fe8b4dd9 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -343,7 +343,7 @@ public class HighOrderServiceImpl implements HighOrderService { "抵扣积分订单：" + highOrder.getOrderNo() + "，使用积分:" + highOrder.getPayGold()); highOrder.setOrderStatus(OrderStatusEnum.type3.getType()); - highOrder.setPayablePrice(highOrder.getPayPrice()); + highOrder.setPayRealPrice(highOrder.getPayPrice()); highOrder.setPayTime(new Date()); for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) {