Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

* 'dev' of http://139.159.177.244:3000/hurui/hai-server:
  提交代码
  提交代码
  提交代码

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -327,15 +327,15 @@ public class HighOrderController {
                         childOrder.setGoodsActualPrice(childOrder.getGoodsPrice());
                         // 油价信息
                         childOrder.setGasPriceGun(priceModel.getPriceGun());
-                        childOrder.setGasPriceVip(priceModel.getPriceVip());
-                        childOrder.setGasPriceOfficial(priceModel.getPriceOfficial());
-                        childOrder.setGasPricePlatform(priceModel.getPriceVip());
+                        childOrder.setGasPriceVip(priceModel.getPriceGun());
+                        childOrder.setGasPriceOfficial(new BigDecimal("0"));
+                        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());

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();

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," +

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;
     }

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.setPayRealPrice(highOrder.getPayPrice());
                 highOrder.setPayTime(new Date());
+
                 for (HighChildOrder childOrder : highOrder.getHighChildOrderList()) {
                     childOrder.setChildOrdeStatus(3);
                 }