Merge remote-tracking branch 'origin/dev' into dev

hai-service/src/main/java/com/hai/config/UnionStagingPayConfig.java

@@ -143,7 +143,7 @@ public class UnionStagingPayConfig {
     }
 
     /**
-     * 分期交易退货
+     * 退货查询
      * @param orgTrace 交易流水
      * @param oriOrgTrace 原机构交易流水号
      * @param prodCode 产品代码

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java

@@ -44,31 +44,31 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         "user_name, user_phone, ",
         "recharge_model, pay_type, ",
         "pay_price, order_price, ",
-        "pay_real_price, pay_serial_no, ",
+        "recharge_type, pay_real_price, ",
-        "deduction_price, `status`, ",
+        "pay_serial_no, deduction_price, ",
-        "recharge_content, recharge_name, ",
+        "`status`, recharge_content, ",
-        "id_card, create_timed, ",
+        "recharge_name, id_card, ",
-        "pay_time, cancel_time, ",
+        "create_timed, pay_time, ",
-        "finish_time, remarks, ",
+        "cancel_time, finish_time, ",
-        "out_refund_no, refund_time, ",
+        "remarks, out_refund_no, ",
-        "refund_id, refund_fee, ",
+        "refund_time, refund_id, ",
-        "agent_key, object_id, ",
+        "refund_fee, agent_key, ",
-        "Identification_code)",
+        "object_id, Identification_code)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
         "#{memDiscountName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
         "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ",
         "#{rechargeModel,jdbcType=INTEGER}, #{payType,jdbcType=INTEGER}, ",
         "#{payPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, ",
-        "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ",
+        "#{rechargeType,jdbcType=INTEGER}, #{payRealPrice,jdbcType=DECIMAL}, ",
-        "#{deductionPrice,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
+        "#{paySerialNo,jdbcType=VARCHAR}, #{deductionPrice,jdbcType=DECIMAL}, ",
-        "#{rechargeContent,jdbcType=VARCHAR}, #{rechargeName,jdbcType=VARCHAR}, ",
+        "#{status,jdbcType=INTEGER}, #{rechargeContent,jdbcType=VARCHAR}, ",
-        "#{idCard,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ",
+        "#{rechargeName,jdbcType=VARCHAR}, #{idCard,jdbcType=VARCHAR}, ",
-        "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
+        "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
-        "#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ",
+        "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
-        "#{outRefundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ",
+        "#{remarks,jdbcType=VARCHAR}, #{outRefundNo,jdbcType=VARCHAR}, ",
-        "#{refundId,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ",
+        "#{refundTime,jdbcType=TIMESTAMP}, #{refundId,jdbcType=VARCHAR}, ",
-        "#{agentKey,jdbcType=VARCHAR}, #{objectId,jdbcType=INTEGER}, ",
+        "#{refundFee,jdbcType=DECIMAL}, #{agentKey,jdbcType=VARCHAR}, ",
-        "#{identificationCode,jdbcType=BIGINT})"
+        "#{objectId,jdbcType=INTEGER}, #{identificationCode,jdbcType=BIGINT})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(OutRechargeOrder record);
@@ -90,6 +90,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="deduction_price", property="deductionPrice", jdbcType=JdbcType.DECIMAL),
@@ -115,10 +116,10 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
     @Select({
         "select",
         "id, order_no, mem_discount_id, mem_discount_name, user_id, user_name, user_phone, ",
-        "recharge_model, pay_type, pay_price, order_price, pay_real_price, pay_serial_no, ",
+        "recharge_model, pay_type, pay_price, order_price, recharge_type, pay_real_price, ",
-        "deduction_price, `status`, recharge_content, recharge_name, id_card, create_timed, ",
+        "pay_serial_no, deduction_price, `status`, recharge_content, recharge_name, id_card, ",
-        "pay_time, cancel_time, finish_time, remarks, out_refund_no, refund_time, refund_id, ",
+        "create_timed, pay_time, cancel_time, finish_time, remarks, out_refund_no, refund_time, ",
-        "refund_fee, agent_key, object_id, Identification_code",
+        "refund_id, refund_fee, agent_key, object_id, Identification_code",
         "from out_recharge_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -134,6 +135,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
         @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="deduction_price", property="deductionPrice", jdbcType=JdbcType.DECIMAL),
@@ -177,6 +179,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt {
           "pay_type = #{payType,jdbcType=INTEGER},",
           "pay_price = #{payPrice,jdbcType=DECIMAL},",
           "order_price = #{orderPrice,jdbcType=DECIMAL},",
+          "recharge_type = #{rechargeType,jdbcType=INTEGER},",
           "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},",
           "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},",
           "deduction_price = #{deductionPrice,jdbcType=DECIMAL},",

hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java

@@ -68,6 +68,10 @@ public class OutRechargeOrderSqlProvider {
             sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}");
         }
@@ -164,6 +168,7 @@ public class OutRechargeOrderSqlProvider {
         sql.SELECT("pay_type");
         sql.SELECT("pay_price");
         sql.SELECT("order_price");
+        sql.SELECT("recharge_type");
         sql.SELECT("pay_real_price");
         sql.SELECT("pay_serial_no");
         sql.SELECT("deduction_price");
@@ -244,6 +249,10 @@ public class OutRechargeOrderSqlProvider {
             sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
         }
@@ -339,6 +348,7 @@ public class OutRechargeOrderSqlProvider {
         sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
         sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}");
         sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}");
+        sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}");
         sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}");
         sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}");
         sql.SET("deduction_price = #{record.deductionPrice,jdbcType=DECIMAL}");
@@ -408,6 +418,10 @@ public class OutRechargeOrderSqlProvider {
             sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getRechargeType() != null) {
+            sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}");
+        }
+        
         if (record.getPayRealPrice() != null) {
             sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}");
         }

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

@@ -69,6 +69,11 @@ public class OutRechargeOrder implements Serializable {
      */
     private BigDecimal orderPrice;
 
+    /**
+     * 1：快充 2：慢充
+     */
+    private Integer rechargeType;
+
     /**
      * 实际金额
      */
@@ -248,6 +253,14 @@ public class OutRechargeOrder implements Serializable {
         this.orderPrice = orderPrice;
     }
 
+    public Integer getRechargeType() {
+        return rechargeType;
+    }
+
+    public void setRechargeType(Integer rechargeType) {
+        this.rechargeType = rechargeType;
+    }
+
     public BigDecimal getPayRealPrice() {
         return payRealPrice;
     }
@@ -423,6 +436,7 @@ public class OutRechargeOrder implements Serializable {
             && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
             && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice()))
             && (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice()))
+            && (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType()))
             && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice()))
             && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo()))
             && (this.getDeductionPrice() == null ? other.getDeductionPrice() == null : this.getDeductionPrice().equals(other.getDeductionPrice()))
@@ -459,6 +473,7 @@ public class OutRechargeOrder implements Serializable {
         result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
         result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode());
         result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode());
+        result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode());
         result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode());
         result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode());
         result = prime * result + ((getDeductionPrice() == null) ? 0 : getDeductionPrice().hashCode());
@@ -498,6 +513,7 @@ public class OutRechargeOrder implements Serializable {
         sb.append(", payType=").append(payType);
         sb.append(", payPrice=").append(payPrice);
         sb.append(", orderPrice=").append(orderPrice);
+        sb.append(", rechargeType=").append(rechargeType);
         sb.append(", payRealPrice=").append(payRealPrice);
         sb.append(", paySerialNo=").append(paySerialNo);
         sb.append(", deductionPrice=").append(deductionPrice);

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

@@ -826,6 +826,66 @@ public class OutRechargeOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andRechargeTypeIsNull() {
+            addCriterion("recharge_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeIsNotNull() {
+            addCriterion("recharge_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeEqualTo(Integer value) {
+            addCriterion("recharge_type =", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotEqualTo(Integer value) {
+            addCriterion("recharge_type <>", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeGreaterThan(Integer value) {
+            addCriterion("recharge_type >", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recharge_type >=", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeLessThan(Integer value) {
+            addCriterion("recharge_type <", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("recharge_type <=", value, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeIn(List<Integer> values) {
+            addCriterion("recharge_type in", values, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotIn(List<Integer> values) {
+            addCriterion("recharge_type not in", values, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeBetween(Integer value1, Integer value2) {
+            addCriterion("recharge_type between", value1, value2, "rechargeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechargeTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("recharge_type not between", value1, value2, "rechargeType");
+            return (Criteria) this;
+        }
+
         public Criteria andPayRealPriceIsNull() {
             addCriterion("pay_real_price is null");
             return (Criteria) this;

hai-service/src/main/resources/dev/commonConfig.properties

@@ -39,8 +39,8 @@ unionPayTelNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://mtest.eycard.cn/
 unionStagingPayOrgId=ORG000000000001
-unionStagingPayOrgMerCode=890000000123679
+unionStagingPayOrgMerCode=83169054816W999
-unionStagingPayOrgTermNo=W0616228
+unionStagingPayOrgTermNo=XS000104
 unionStagingPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
 unionStagingPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/stagingNotify
 

hai-service/src/main/resources/prod/commonConfig.properties

@@ -32,8 +32,8 @@ unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://mtest.eycard.cn/
 unionStagingPayOrgId=ORG000000000001
-unionStagingPayOrgMerCode=890000000123679
+unionStagingPayOrgMerCode=83169054816W999
-unionStagingPayOrgTermNo=W0616228
+unionStagingPayOrgTermNo=XS000104
 unionStagingPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
 unionStagingPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/stagingNotify