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

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

hai-order/src/main/java/com/web/controller/business/OrderOilController.java

@@ -63,13 +63,17 @@ public class OrderOilController {
                                         @RequestParam(name = "orderNo", required = false) String orderNo,
                                         @RequestParam(name = "childOrderNo", required = false) String childOrderNo,
                                         @RequestParam(name = "memPhone", required = false) String memPhone,
+                                        @RequestParam(name = "memCardType", required = false) Integer memCardType,
+                                        @RequestParam(name = "memCardNo", required = false) String memCardNo,
                                         @RequestParam(name = "gasOilType", required = false) Integer gasOilType,
+                                        @RequestParam(name = "payType", required = false) Integer payType,
                                         @RequestParam(name = "status", required = false) Integer status,
                                         @RequestParam(name = "gasOrgId", required = false) Long gasOrgId,
                                         @RequestParam(name = "gasAgentId", required = false) Long gasAgentId,
                                         @RequestParam(name = "gasSalesmanId", required = false) Long gasSalesmanId,
                                         @RequestParam(name = "gasStaffName", required = false) String gasStaffName,
                                         @RequestParam(name = "gasOilNo", required = false) String gasOilNo,
+                                        @RequestParam(name = "gasCarLicensePlate", required = false) String gasCarLicensePlate,
                                         @RequestParam(name = "createTimeS", required = false) Long createTimeS,
                                         @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                         @RequestParam(name = "payTimeS", required = false) Long payTimeS,
@@ -138,10 +142,14 @@ public class OrderOilController {
             param.put("gasOrgId", gasOrgId);
             param.put("gasAgentId", gasAgentId);
             param.put("gasSalesmanId", gasAgentId);
+            param.put("memCardType", memCardType);
+            param.put("memCardNo", memCardNo);
             param.put("memPhone", memPhone);
             param.put("gasOilNo", gasOilNo);
+            param.put("gasCarLicensePlate", gasCarLicensePlate);
             param.put("orderNo", orderNo);
             param.put("childOrderNo", childOrderNo);
+            param.put("payType", payType);
             param.put("status", status);
             param.put("createTimeS", createTimeS);
             param.put("createTimeE", createTimeE);

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

@@ -47,6 +47,7 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
         "store_name, store_address, ",
         "total_deduction_price, deduction_coupon_price, ",
         "deduction_product_price, payable_price, ",
+        "mem_card_type, mem_card_no, ",
         "pay_gold, pay_price, ",
         "gas_refuel_price, gas_car_license_plate, ",
         "gas_oil_no, gas_gun_no, ",
@@ -76,6 +77,7 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
         "#{storeName,jdbcType=VARCHAR}, #{storeAddress,jdbcType=VARCHAR}, ",
         "#{totalDeductionPrice,jdbcType=DECIMAL}, #{deductionCouponPrice,jdbcType=DECIMAL}, ",
         "#{deductionProductPrice,jdbcType=DECIMAL}, #{payablePrice,jdbcType=DECIMAL}, ",
+        "#{memCardType,jdbcType=INTEGER}, #{memCardNo,jdbcType=VARCHAR}, ",
         "#{payGold,jdbcType=INTEGER}, #{payPrice,jdbcType=DECIMAL}, ",
         "#{gasRefuelPrice,jdbcType=DECIMAL}, #{gasCarLicensePlate,jdbcType=VARCHAR}, ",
         "#{gasOilNo,jdbcType=VARCHAR}, #{gasGunNo,jdbcType=VARCHAR}, ",
@@ -125,6 +127,8 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
         @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER),
+        @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="gas_refuel_price", property="gasRefuelPrice", jdbcType=JdbcType.DECIMAL),
@@ -176,10 +180,10 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
         "id, order_no, child_order_no, channel_type, channel_order_no, mem_id, mem_phone, ",
         "company_id, company_name, mer_id, mer_name, store_id, store_name, store_address, ",
         "total_deduction_price, deduction_coupon_price, deduction_product_price, payable_price, ",
-        "pay_gold, pay_price, gas_refuel_price, gas_car_license_plate, gas_oil_no, gas_gun_no, ",
+        "mem_card_type, mem_card_no, pay_gold, pay_price, gas_refuel_price, gas_car_license_plate, ",
-        "gas_oil_type, gas_price_platform, gas_price_gun, gas_price_vip, gas_price_official, ",
+        "gas_oil_no, gas_gun_no, gas_oil_type, gas_price_platform, gas_price_gun, gas_price_vip, ",
-        "gas_price_cost, gas_price_cost_total, gas_price_channel_pay, gas_oil_liters, ",
+        "gas_price_official, gas_price_cost, gas_price_cost_total, gas_price_channel_pay, ",
-        "gas_discount, gas_oil_subsidy, gas_liters_preferences, gas_price_preferences, ",
+        "gas_oil_liters, gas_discount, gas_oil_subsidy, gas_liters_preferences, gas_price_preferences, ",
         "gas_class_group_id, gas_class_group_name, gas_class_group_task_id, gas_staff_id, ",
         "gas_staff_name, gas_salesman_id, gas_salesman_name, gas_agent_id, gas_agent_name, ",
         "gas_org_id, gas_org_name, pay_type, `status`, create_time, cancel_time, pay_time, ",
@@ -206,6 +210,8 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
         @Result(column="deduction_coupon_price", property="deductionCouponPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="deduction_product_price", property="deductionProductPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="payable_price", property="payablePrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="mem_card_type", property="memCardType", jdbcType=JdbcType.INTEGER),
+        @Result(column="mem_card_no", property="memCardNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="pay_gold", property="payGold", jdbcType=JdbcType.INTEGER),
         @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="gas_refuel_price", property="gasRefuelPrice", jdbcType=JdbcType.DECIMAL),
@@ -280,6 +286,8 @@ public interface HighGasOrderMapper extends HighGasOrderMapperExt {
           "deduction_coupon_price = #{deductionCouponPrice,jdbcType=DECIMAL},",
           "deduction_product_price = #{deductionProductPrice,jdbcType=DECIMAL},",
           "payable_price = #{payablePrice,jdbcType=DECIMAL},",
+          "mem_card_type = #{memCardType,jdbcType=INTEGER},",
+          "mem_card_no = #{memCardNo,jdbcType=VARCHAR},",
           "pay_gold = #{payGold,jdbcType=INTEGER},",
           "pay_price = #{payPrice,jdbcType=DECIMAL},",
           "gas_refuel_price = #{gasRefuelPrice,jdbcType=DECIMAL},",

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

@@ -96,6 +96,14 @@ public class HighGasOrderSqlProvider {
             sql.VALUES("payable_price", "#{payablePrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getMemCardType() != null) {
+            sql.VALUES("mem_card_type", "#{memCardType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMemCardNo() != null) {
+            sql.VALUES("mem_card_no", "#{memCardNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayGold() != null) {
             sql.VALUES("pay_gold", "#{payGold,jdbcType=INTEGER}");
         }
@@ -295,6 +303,8 @@ public class HighGasOrderSqlProvider {
         sql.SELECT("deduction_coupon_price");
         sql.SELECT("deduction_product_price");
         sql.SELECT("payable_price");
+        sql.SELECT("mem_card_type");
+        sql.SELECT("mem_card_no");
         sql.SELECT("pay_gold");
         sql.SELECT("pay_price");
         sql.SELECT("gas_refuel_price");
@@ -427,6 +437,14 @@ public class HighGasOrderSqlProvider {
             sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getMemCardType() != null) {
+            sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMemCardNo() != null) {
+            sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayGold() != null) {
             sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}");
         }
@@ -625,6 +643,8 @@ public class HighGasOrderSqlProvider {
         sql.SET("deduction_coupon_price = #{record.deductionCouponPrice,jdbcType=DECIMAL}");
         sql.SET("deduction_product_price = #{record.deductionProductPrice,jdbcType=DECIMAL}");
         sql.SET("payable_price = #{record.payablePrice,jdbcType=DECIMAL}");
+        sql.SET("mem_card_type = #{record.memCardType,jdbcType=INTEGER}");
+        sql.SET("mem_card_no = #{record.memCardNo,jdbcType=VARCHAR}");
         sql.SET("pay_gold = #{record.payGold,jdbcType=INTEGER}");
         sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}");
         sql.SET("gas_refuel_price = #{record.gasRefuelPrice,jdbcType=DECIMAL}");
@@ -746,6 +766,14 @@ public class HighGasOrderSqlProvider {
             sql.SET("payable_price = #{payablePrice,jdbcType=DECIMAL}");
         }
         
+        if (record.getMemCardType() != null) {
+            sql.SET("mem_card_type = #{memCardType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getMemCardNo() != null) {
+            sql.SET("mem_card_no = #{memCardNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getPayGold() != null) {
             sql.SET("pay_gold = #{payGold,jdbcType=INTEGER}");
         }

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

@@ -104,6 +104,16 @@ public class HighGasOrder implements Serializable {
      */
     private BigDecimal payablePrice;
 
+    /**
+     * 卡类型 
+     */
+    private Integer memCardType;
+
+    /**
+     * 卡号
+     */
+    private String memCardNo;
+
     /**
      * 积分抵扣
      */
@@ -453,6 +463,22 @@ public class HighGasOrder implements Serializable {
         this.payablePrice = payablePrice;
     }
 
+    public Integer getMemCardType() {
+        return memCardType;
+    }
+
+    public void setMemCardType(Integer memCardType) {
+        this.memCardType = memCardType;
+    }
+
+    public String getMemCardNo() {
+        return memCardNo;
+    }
+
+    public void setMemCardNo(String memCardNo) {
+        this.memCardNo = memCardNo;
+    }
+
     public Integer getPayGold() {
         return payGold;
     }
@@ -827,6 +853,8 @@ public class HighGasOrder implements Serializable {
             && (this.getDeductionCouponPrice() == null ? other.getDeductionCouponPrice() == null : this.getDeductionCouponPrice().equals(other.getDeductionCouponPrice()))
             && (this.getDeductionProductPrice() == null ? other.getDeductionProductPrice() == null : this.getDeductionProductPrice().equals(other.getDeductionProductPrice()))
             && (this.getPayablePrice() == null ? other.getPayablePrice() == null : this.getPayablePrice().equals(other.getPayablePrice()))
+            && (this.getMemCardType() == null ? other.getMemCardType() == null : this.getMemCardType().equals(other.getMemCardType()))
+            && (this.getMemCardNo() == null ? other.getMemCardNo() == null : this.getMemCardNo().equals(other.getMemCardNo()))
             && (this.getPayGold() == null ? other.getPayGold() == null : this.getPayGold().equals(other.getPayGold()))
             && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice()))
             && (this.getGasRefuelPrice() == null ? other.getGasRefuelPrice() == null : this.getGasRefuelPrice().equals(other.getGasRefuelPrice()))
@@ -894,6 +922,8 @@ public class HighGasOrder implements Serializable {
         result = prime * result + ((getDeductionCouponPrice() == null) ? 0 : getDeductionCouponPrice().hashCode());
         result = prime * result + ((getDeductionProductPrice() == null) ? 0 : getDeductionProductPrice().hashCode());
         result = prime * result + ((getPayablePrice() == null) ? 0 : getPayablePrice().hashCode());
+        result = prime * result + ((getMemCardType() == null) ? 0 : getMemCardType().hashCode());
+        result = prime * result + ((getMemCardNo() == null) ? 0 : getMemCardNo().hashCode());
         result = prime * result + ((getPayGold() == null) ? 0 : getPayGold().hashCode());
         result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode());
         result = prime * result + ((getGasRefuelPrice() == null) ? 0 : getGasRefuelPrice().hashCode());
@@ -964,6 +994,8 @@ public class HighGasOrder implements Serializable {
         sb.append(", deductionCouponPrice=").append(deductionCouponPrice);
         sb.append(", deductionProductPrice=").append(deductionProductPrice);
         sb.append(", payablePrice=").append(payablePrice);
+        sb.append(", memCardType=").append(memCardType);
+        sb.append(", memCardNo=").append(memCardNo);
         sb.append(", payGold=").append(payGold);
         sb.append(", payPrice=").append(payPrice);
         sb.append(", gasRefuelPrice=").append(gasRefuelPrice);

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

@@ -1286,6 +1286,136 @@ public class HighGasOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andMemCardTypeIsNull() {
+            addCriterion("mem_card_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeIsNotNull() {
+            addCriterion("mem_card_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeEqualTo(Integer value) {
+            addCriterion("mem_card_type =", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeNotEqualTo(Integer value) {
+            addCriterion("mem_card_type <>", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeGreaterThan(Integer value) {
+            addCriterion("mem_card_type >", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("mem_card_type >=", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeLessThan(Integer value) {
+            addCriterion("mem_card_type <", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("mem_card_type <=", value, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeIn(List<Integer> values) {
+            addCriterion("mem_card_type in", values, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeNotIn(List<Integer> values) {
+            addCriterion("mem_card_type not in", values, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeBetween(Integer value1, Integer value2) {
+            addCriterion("mem_card_type between", value1, value2, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("mem_card_type not between", value1, value2, "memCardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoIsNull() {
+            addCriterion("mem_card_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoIsNotNull() {
+            addCriterion("mem_card_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoEqualTo(String value) {
+            addCriterion("mem_card_no =", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoNotEqualTo(String value) {
+            addCriterion("mem_card_no <>", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoGreaterThan(String value) {
+            addCriterion("mem_card_no >", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoGreaterThanOrEqualTo(String value) {
+            addCriterion("mem_card_no >=", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoLessThan(String value) {
+            addCriterion("mem_card_no <", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoLessThanOrEqualTo(String value) {
+            addCriterion("mem_card_no <=", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoLike(String value) {
+            addCriterion("mem_card_no like", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoNotLike(String value) {
+            addCriterion("mem_card_no not like", value, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoIn(List<String> values) {
+            addCriterion("mem_card_no in", values, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoNotIn(List<String> values) {
+            addCriterion("mem_card_no not in", values, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoBetween(String value1, String value2) {
+            addCriterion("mem_card_no between", value1, value2, "memCardNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemCardNoNotBetween(String value1, String value2) {
+            addCriterion("mem_card_no not between", value1, value2, "memCardNo");
+            return (Criteria) this;
+        }
+
         public Criteria andPayGoldIsNull() {
             addCriterion("pay_gold is null");
             return (Criteria) this;

hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java

@@ -268,6 +268,8 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
         // 查询加油订单
         HighGasOrder gasOrder = gasOrderService.getDetailByChildOrderNo(childOrder.getChildOrderNo());
         if (gasOrder != null) {
+            gasOrder.setMemCardType(order.getMemCardType());
+            gasOrder.setMemCardNo(order.getMemCardNo());
             gasOrder.setPayTime(new Date());
             gasOrder.setStatus(OrderOilStatus.STATUS2.getNumber());
             gasOrder.setPayType(order.getPayType());

hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java

@@ -118,6 +118,10 @@ public class HighGasOrderServiceImpl implements HighGasOrderService {
             criteria.andGasOilNoEqualTo(MapUtils.getString(param, "gasOilNo"));
         }
 
+        if (MapUtils.getInteger(param, "payType") != null) {
+            criteria.andPayTypeEqualTo(MapUtils.getInteger(param, "payType"));
+        }
+
         if (MapUtils.getInteger(param, "status") != null) {
             criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
         }