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

hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java

@@ -118,6 +118,8 @@ public class OutRechargePriceController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.UPDATE_DATA_ERROR, "");
             }
 
+            outRechargePrice.setCreateTime(outRechargePrice1.getCreateTime());
+
             outRechargePriceService.updateRechargePrice(outRechargePrice);
 
             return ResponseMsgUtil.success("修改成功");

hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java

@@ -1,6 +1,7 @@
 package com.hai.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -51,17 +52,17 @@ public class OutRechargeOrder extends HighOrder implements Serializable {
     /**
      * 支付金额
      */
-    private Long payPrice;
+    private BigDecimal payPrice;
 
     /**
      * 订单充值金额
      */
-    private Long orderPrice;
+    private BigDecimal orderPrice;
 
     /**
      * 实际金额
      */
-    private Long payRealPrice;
+    private BigDecimal payRealPrice;
 
     /**
      * 支付流水号
@@ -121,7 +122,7 @@ public class OutRechargeOrder extends HighOrder implements Serializable {
     /**
      * 退款金额
      */
-    private Long refundFee;
+    private BigDecimal refundFee;
 
     private static final long serialVersionUID = 1L;
 
@@ -181,27 +182,27 @@ public class OutRechargeOrder extends HighOrder implements Serializable {
         this.payType = payType;
     }
 
-    public Long getPayPrice() {
+    public BigDecimal getPayPrice() {
         return payPrice;
     }
 
-    public void setPayPrice(Long payPrice) {
+    public void setPayPrice(BigDecimal payPrice) {
         this.payPrice = payPrice;
     }
 
-    public Long getOrderPrice() {
+    public BigDecimal getOrderPrice() {
         return orderPrice;
     }
 
-    public void setOrderPrice(Long orderPrice) {
+    public void setOrderPrice(BigDecimal orderPrice) {
         this.orderPrice = orderPrice;
     }
 
-    public Long getPayRealPrice() {
+    public BigDecimal getPayRealPrice() {
         return payRealPrice;
     }
 
-    public void setPayRealPrice(Long payRealPrice) {
+    public void setPayRealPrice(BigDecimal payRealPrice) {
         this.payRealPrice = payRealPrice;
     }
 
@@ -293,11 +294,11 @@ public class OutRechargeOrder extends HighOrder implements Serializable {
         this.outRefundNo = outRefundNo;
     }
 
-    public Long getRefundFee() {
+    public BigDecimal getRefundFee() {
         return refundFee;
     }
 
-    public void setRefundFee(Long refundFee) {
+    public void setRefundFee(BigDecimal refundFee) {
         this.refundFee = refundFee;
     }
 

hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java

@@ -1,5 +1,6 @@
 package com.hai.entity;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -585,52 +586,52 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceEqualTo(Long value) {
+        public Criteria andPayPriceEqualTo(BigDecimal value) {
             addCriterion("pay_price =", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceNotEqualTo(Long value) {
+        public Criteria andPayPriceNotEqualTo(BigDecimal value) {
             addCriterion("pay_price <>", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceGreaterThan(Long value) {
+        public Criteria andPayPriceGreaterThan(BigDecimal value) {
             addCriterion("pay_price >", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceGreaterThanOrEqualTo(Long value) {
+        public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) {
             addCriterion("pay_price >=", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceLessThan(Long value) {
+        public Criteria andPayPriceLessThan(BigDecimal value) {
             addCriterion("pay_price <", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceLessThanOrEqualTo(Long value) {
+        public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) {
             addCriterion("pay_price <=", value, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceIn(List<Long> values) {
+        public Criteria andPayPriceIn(List<BigDecimal> values) {
             addCriterion("pay_price in", values, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceNotIn(List<Long> values) {
+        public Criteria andPayPriceNotIn(List<BigDecimal> values) {
             addCriterion("pay_price not in", values, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceBetween(Long value1, Long value2) {
+        public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("pay_price between", value1, value2, "payPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayPriceNotBetween(Long value1, Long value2) {
+        public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("pay_price not between", value1, value2, "payPrice");
             return (Criteria) this;
         }
@@ -645,52 +646,52 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceEqualTo(Long value) {
+        public Criteria andOrderPriceEqualTo(BigDecimal value) {
             addCriterion("order_price =", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceNotEqualTo(Long value) {
+        public Criteria andOrderPriceNotEqualTo(BigDecimal value) {
             addCriterion("order_price <>", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceGreaterThan(Long value) {
+        public Criteria andOrderPriceGreaterThan(BigDecimal value) {
             addCriterion("order_price >", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceGreaterThanOrEqualTo(Long value) {
+        public Criteria andOrderPriceGreaterThanOrEqualTo(BigDecimal value) {
             addCriterion("order_price >=", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceLessThan(Long value) {
+        public Criteria andOrderPriceLessThan(BigDecimal value) {
             addCriterion("order_price <", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceLessThanOrEqualTo(Long value) {
+        public Criteria andOrderPriceLessThanOrEqualTo(BigDecimal value) {
             addCriterion("order_price <=", value, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceIn(List<Long> values) {
+        public Criteria andOrderPriceIn(List<BigDecimal> values) {
             addCriterion("order_price in", values, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceNotIn(List<Long> values) {
+        public Criteria andOrderPriceNotIn(List<BigDecimal> values) {
             addCriterion("order_price not in", values, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceBetween(Long value1, Long value2) {
+        public Criteria andOrderPriceBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("order_price between", value1, value2, "orderPrice");
             return (Criteria) this;
         }
 
-        public Criteria andOrderPriceNotBetween(Long value1, Long value2) {
+        public Criteria andOrderPriceNotBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("order_price not between", value1, value2, "orderPrice");
             return (Criteria) this;
         }
@@ -705,52 +706,52 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceEqualTo(Long value) {
+        public Criteria andPayRealPriceEqualTo(BigDecimal value) {
             addCriterion("pay_real_price =", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceNotEqualTo(Long value) {
+        public Criteria andPayRealPriceNotEqualTo(BigDecimal value) {
             addCriterion("pay_real_price <>", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceGreaterThan(Long value) {
+        public Criteria andPayRealPriceGreaterThan(BigDecimal value) {
             addCriterion("pay_real_price >", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceGreaterThanOrEqualTo(Long value) {
+        public Criteria andPayRealPriceGreaterThanOrEqualTo(BigDecimal value) {
             addCriterion("pay_real_price >=", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceLessThan(Long value) {
+        public Criteria andPayRealPriceLessThan(BigDecimal value) {
             addCriterion("pay_real_price <", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceLessThanOrEqualTo(Long value) {
+        public Criteria andPayRealPriceLessThanOrEqualTo(BigDecimal value) {
             addCriterion("pay_real_price <=", value, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceIn(List<Long> values) {
+        public Criteria andPayRealPriceIn(List<BigDecimal> values) {
             addCriterion("pay_real_price in", values, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceNotIn(List<Long> values) {
+        public Criteria andPayRealPriceNotIn(List<BigDecimal> values) {
             addCriterion("pay_real_price not in", values, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceBetween(Long value1, Long value2) {
+        public Criteria andPayRealPriceBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("pay_real_price between", value1, value2, "payRealPrice");
             return (Criteria) this;
         }
 
-        public Criteria andPayRealPriceNotBetween(Long value1, Long value2) {
+        public Criteria andPayRealPriceNotBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("pay_real_price not between", value1, value2, "payRealPrice");
             return (Criteria) this;
         }
@@ -1485,52 +1486,52 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeEqualTo(Long value) {
+        public Criteria andRefundFeeEqualTo(BigDecimal value) {
             addCriterion("refund_fee =", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeNotEqualTo(Long value) {
+        public Criteria andRefundFeeNotEqualTo(BigDecimal value) {
             addCriterion("refund_fee <>", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeGreaterThan(Long value) {
+        public Criteria andRefundFeeGreaterThan(BigDecimal value) {
             addCriterion("refund_fee >", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeGreaterThanOrEqualTo(Long value) {
+        public Criteria andRefundFeeGreaterThanOrEqualTo(BigDecimal value) {
             addCriterion("refund_fee >=", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeLessThan(Long value) {
+        public Criteria andRefundFeeLessThan(BigDecimal value) {
             addCriterion("refund_fee <", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeLessThanOrEqualTo(Long value) {
+        public Criteria andRefundFeeLessThanOrEqualTo(BigDecimal value) {
             addCriterion("refund_fee <=", value, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeIn(List<Long> values) {
+        public Criteria andRefundFeeIn(List<BigDecimal> values) {
             addCriterion("refund_fee in", values, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeNotIn(List<Long> values) {
+        public Criteria andRefundFeeNotIn(List<BigDecimal> values) {
             addCriterion("refund_fee not in", values, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeBetween(Long value1, Long value2) {
+        public Criteria andRefundFeeBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("refund_fee between", value1, value2, "refundFee");
             return (Criteria) this;
         }
 
-        public Criteria andRefundFeeNotBetween(Long value1, Long value2) {
+        public Criteria andRefundFeeNotBetween(BigDecimal value1, BigDecimal value2) {
             addCriterion("refund_fee not between", value1, value2, "refundFee");
             return (Criteria) this;
         }