xubh 5 лет назад
Родитель
Сommit
f24dd7ab72

+ 2 - 1
src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -187,9 +187,10 @@ public class OrderServiceImpl implements IOrderService {
 			}
 		}
 		ordInf.setOrderAmt(orderAmt);		//订单总金额
+		ordInf.setBranchid(equInf.getBranchid());
 		//执行新增订单数据
 		Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(VmOrderInfMapper.class).insert(ordInf);
+				.getMybatisMapper(VmOrderInfMapper.class).insertSelective(ordInf);
 		return ordId;
 	}
 

+ 20 - 20
src/main/java/com/minpay/db/table/model/VmOrderDetails.java

@@ -29,19 +29,19 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_order_details.VOD_CARGO_WAY
+     * This field corresponds to the database column vm_order_details.VOD_PRO_EQU_REL_ID
      *
      * @mbggenerated
      */
-    private String cargoWay;
+    private String proEquRelId;
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_order_details.VOD_PRO_EQU_REL_ID
+     * This field corresponds to the database column vm_order_details.VOD_CARGO_WAY
      *
      * @mbggenerated
      */
-    private String proEquRelId;
+    private String cargoWay;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -213,50 +213,50 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_order_details.VOD_CARGO_WAY
+     * This method returns the value of the database column vm_order_details.VOD_PRO_EQU_REL_ID
      *
-     * @return the value of vm_order_details.VOD_CARGO_WAY
+     * @return the value of vm_order_details.VOD_PRO_EQU_REL_ID
      *
      * @mbggenerated
      */
-    public String getCargoWay() {
-        return cargoWay;
+    public String getProEquRelId() {
+        return proEquRelId;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_order_details.VOD_CARGO_WAY
+     * This method sets the value of the database column vm_order_details.VOD_PRO_EQU_REL_ID
      *
-     * @param cargoWay the value for vm_order_details.VOD_CARGO_WAY
+     * @param proEquRelId the value for vm_order_details.VOD_PRO_EQU_REL_ID
      *
      * @mbggenerated
      */
-    public void setCargoWay(String cargoWay) {
-        this.cargoWay = cargoWay == null ? null : cargoWay.trim();
+    public void setProEquRelId(String proEquRelId) {
+        this.proEquRelId = proEquRelId == null ? null : proEquRelId.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_order_details.VOD_PRO_EQU_REL_ID
+     * This method returns the value of the database column vm_order_details.VOD_CARGO_WAY
      *
-     * @return the value of vm_order_details.VOD_PRO_EQU_REL_ID
+     * @return the value of vm_order_details.VOD_CARGO_WAY
      *
      * @mbggenerated
      */
-    public String getProEquRelId() {
-        return proEquRelId;
+    public String getCargoWay() {
+        return cargoWay;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_order_details.VOD_PRO_EQU_REL_ID
+     * This method sets the value of the database column vm_order_details.VOD_CARGO_WAY
      *
-     * @param proEquRelId the value for vm_order_details.VOD_PRO_EQU_REL_ID
+     * @param cargoWay the value for vm_order_details.VOD_CARGO_WAY
      *
      * @mbggenerated
      */
-    public void setProEquRelId(String proEquRelId) {
-        this.proEquRelId = proEquRelId == null ? null : proEquRelId.trim();
+    public void setCargoWay(String cargoWay) {
+        this.cargoWay = cargoWay == null ? null : cargoWay.trim();
     }
 
     /**

+ 60 - 60
src/main/java/com/minpay/db/table/model/VmOrderDetailsExample.java

@@ -424,159 +424,159 @@ public class VmOrderDetailsExample {
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayIsNull() {
-            addCriterion("VOD_CARGO_WAY is null");
+        public Criteria andProEquRelIdIsNull() {
+            addCriterion("VOD_PRO_EQU_REL_ID is null");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayIsNotNull() {
-            addCriterion("VOD_CARGO_WAY is not null");
+        public Criteria andProEquRelIdIsNotNull() {
+            addCriterion("VOD_PRO_EQU_REL_ID is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayEqualTo(String value) {
+        public Criteria andProEquRelIdEqualTo(String value) {
             if(value == null ){
-                andCargoWayIsNull();
+                andProEquRelIdIsNull();
             } else {
-                addCriterion("VOD_CARGO_WAY =", value, "cargoWay");
+                addCriterion("VOD_PRO_EQU_REL_ID =", value, "proEquRelId");
             }
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayNotEqualTo(String value) {
+        public Criteria andProEquRelIdNotEqualTo(String value) {
             if(value == null ){
-                andCargoWayIsNotNull();
+                andProEquRelIdIsNotNull();
             } else {
-                addCriterion("VOD_CARGO_WAY <>", value, "cargoWay");
+                addCriterion("VOD_PRO_EQU_REL_ID <>", value, "proEquRelId");
             }
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayGreaterThan(String value) {
-            addCriterion("VOD_CARGO_WAY >", value, "cargoWay");
+        public Criteria andProEquRelIdGreaterThan(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID >", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayGreaterThanOrEqualTo(String value) {
-            addCriterion("VOD_CARGO_WAY >=", value, "cargoWay");
+        public Criteria andProEquRelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID >=", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayLessThan(String value) {
-            addCriterion("VOD_CARGO_WAY <", value, "cargoWay");
+        public Criteria andProEquRelIdLessThan(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID <", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayLessThanOrEqualTo(String value) {
-            addCriterion("VOD_CARGO_WAY <=", value, "cargoWay");
+        public Criteria andProEquRelIdLessThanOrEqualTo(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID <=", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayLike(String value) {
-            addCriterion("VOD_CARGO_WAY like", value, "cargoWay");
+        public Criteria andProEquRelIdLike(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID like", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayNotLike(String value) {
-            addCriterion("VOD_CARGO_WAY not like", value, "cargoWay");
+        public Criteria andProEquRelIdNotLike(String value) {
+            addCriterion("VOD_PRO_EQU_REL_ID not like", value, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayIn(List<String> values) {
-            addCriterion("VOD_CARGO_WAY in", values, "cargoWay");
+        public Criteria andProEquRelIdIn(List<String> values) {
+            addCriterion("VOD_PRO_EQU_REL_ID in", values, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayNotIn(List<String> values) {
-            addCriterion("VOD_CARGO_WAY not in", values, "cargoWay");
+        public Criteria andProEquRelIdNotIn(List<String> values) {
+            addCriterion("VOD_PRO_EQU_REL_ID not in", values, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayBetween(String value1, String value2) {
-            addCriterion("VOD_CARGO_WAY between", value1, value2, "cargoWay");
+        public Criteria andProEquRelIdBetween(String value1, String value2) {
+            addCriterion("VOD_PRO_EQU_REL_ID between", value1, value2, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andCargoWayNotBetween(String value1, String value2) {
-            addCriterion("VOD_CARGO_WAY not between", value1, value2, "cargoWay");
+        public Criteria andProEquRelIdNotBetween(String value1, String value2) {
+            addCriterion("VOD_PRO_EQU_REL_ID not between", value1, value2, "proEquRelId");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdIsNull() {
-            addCriterion("VOD_PRO_EQU_REL_ID is null");
+        public Criteria andCargoWayIsNull() {
+            addCriterion("VOD_CARGO_WAY is null");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdIsNotNull() {
-            addCriterion("VOD_PRO_EQU_REL_ID is not null");
+        public Criteria andCargoWayIsNotNull() {
+            addCriterion("VOD_CARGO_WAY is not null");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdEqualTo(String value) {
+        public Criteria andCargoWayEqualTo(String value) {
             if(value == null ){
-                andProEquRelIdIsNull();
+                andCargoWayIsNull();
             } else {
-                addCriterion("VOD_PRO_EQU_REL_ID =", value, "proEquRelId");
+                addCriterion("VOD_CARGO_WAY =", value, "cargoWay");
             }
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdNotEqualTo(String value) {
+        public Criteria andCargoWayNotEqualTo(String value) {
             if(value == null ){
-                andProEquRelIdIsNotNull();
+                andCargoWayIsNotNull();
             } else {
-                addCriterion("VOD_PRO_EQU_REL_ID <>", value, "proEquRelId");
+                addCriterion("VOD_CARGO_WAY <>", value, "cargoWay");
             }
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdGreaterThan(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID >", value, "proEquRelId");
+        public Criteria andCargoWayGreaterThan(String value) {
+            addCriterion("VOD_CARGO_WAY >", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdGreaterThanOrEqualTo(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID >=", value, "proEquRelId");
+        public Criteria andCargoWayGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_CARGO_WAY >=", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdLessThan(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID <", value, "proEquRelId");
+        public Criteria andCargoWayLessThan(String value) {
+            addCriterion("VOD_CARGO_WAY <", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdLessThanOrEqualTo(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID <=", value, "proEquRelId");
+        public Criteria andCargoWayLessThanOrEqualTo(String value) {
+            addCriterion("VOD_CARGO_WAY <=", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdLike(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID like", value, "proEquRelId");
+        public Criteria andCargoWayLike(String value) {
+            addCriterion("VOD_CARGO_WAY like", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdNotLike(String value) {
-            addCriterion("VOD_PRO_EQU_REL_ID not like", value, "proEquRelId");
+        public Criteria andCargoWayNotLike(String value) {
+            addCriterion("VOD_CARGO_WAY not like", value, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdIn(List<String> values) {
-            addCriterion("VOD_PRO_EQU_REL_ID in", values, "proEquRelId");
+        public Criteria andCargoWayIn(List<String> values) {
+            addCriterion("VOD_CARGO_WAY in", values, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdNotIn(List<String> values) {
-            addCriterion("VOD_PRO_EQU_REL_ID not in", values, "proEquRelId");
+        public Criteria andCargoWayNotIn(List<String> values) {
+            addCriterion("VOD_CARGO_WAY not in", values, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdBetween(String value1, String value2) {
-            addCriterion("VOD_PRO_EQU_REL_ID between", value1, value2, "proEquRelId");
+        public Criteria andCargoWayBetween(String value1, String value2) {
+            addCriterion("VOD_CARGO_WAY between", value1, value2, "cargoWay");
             return (Criteria) this;
         }
 
-        public Criteria andProEquRelIdNotBetween(String value1, String value2) {
-            addCriterion("VOD_PRO_EQU_REL_ID not between", value1, value2, "proEquRelId");
+        public Criteria andCargoWayNotBetween(String value1, String value2) {
+            addCriterion("VOD_CARGO_WAY not between", value1, value2, "cargoWay");
             return (Criteria) this;
         }
 

+ 0 - 96
src/main/java/com/minpay/db/table/model/VmOrderInf.java

@@ -205,30 +205,6 @@ public class VmOrderInf extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_order_inf.VOI_PRODUCT_NAME
-     *
-     * @mbggenerated
-     */
-    private String productName;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_order_inf.VOI_PRODUCT_ID
-     *
-     * @mbggenerated
-     */
-    private String productId;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column vm_order_inf.VOI_EQUREL_ID
-     *
-     * @mbggenerated
-     */
-    private String equrelId;
-
-    /**
-     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column vm_order_inf.VOI_OPERATION
      *
      * @mbggenerated
@@ -837,78 +813,6 @@ public class VmOrderInf extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_order_inf.VOI_PRODUCT_NAME
-     *
-     * @return the value of vm_order_inf.VOI_PRODUCT_NAME
-     *
-     * @mbggenerated
-     */
-    public String getProductName() {
-        return productName;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_order_inf.VOI_PRODUCT_NAME
-     *
-     * @param productName the value for vm_order_inf.VOI_PRODUCT_NAME
-     *
-     * @mbggenerated
-     */
-    public void setProductName(String productName) {
-        this.productName = productName == null ? null : productName.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_order_inf.VOI_PRODUCT_ID
-     *
-     * @return the value of vm_order_inf.VOI_PRODUCT_ID
-     *
-     * @mbggenerated
-     */
-    public String getProductId() {
-        return productId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_order_inf.VOI_PRODUCT_ID
-     *
-     * @param productId the value for vm_order_inf.VOI_PRODUCT_ID
-     *
-     * @mbggenerated
-     */
-    public void setProductId(String productId) {
-        this.productId = productId == null ? null : productId.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column vm_order_inf.VOI_EQUREL_ID
-     *
-     * @return the value of vm_order_inf.VOI_EQUREL_ID
-     *
-     * @mbggenerated
-     */
-    public String getEqurelId() {
-        return equrelId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column vm_order_inf.VOI_EQUREL_ID
-     *
-     * @param equrelId the value for vm_order_inf.VOI_EQUREL_ID
-     *
-     * @mbggenerated
-     */
-    public void setEqurelId(String equrelId) {
-        this.equrelId = equrelId == null ? null : equrelId.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_inf.VOI_OPERATION
      *
      * @return the value of vm_order_inf.VOI_OPERATION

+ 0 - 234
src/main/java/com/minpay/db/table/model/VmOrderInfExample.java

@@ -2140,240 +2140,6 @@ public class VmOrderInfExample {
             return (Criteria) this;
         }
 
-        public Criteria andProductNameIsNull() {
-            addCriterion("VOI_PRODUCT_NAME is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameIsNotNull() {
-            addCriterion("VOI_PRODUCT_NAME is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameEqualTo(String value) {
-            if(value == null ){
-                andProductNameIsNull();
-            } else {
-                addCriterion("VOI_PRODUCT_NAME =", value, "productName");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameNotEqualTo(String value) {
-            if(value == null ){
-                andProductNameIsNotNull();
-            } else {
-                addCriterion("VOI_PRODUCT_NAME <>", value, "productName");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameGreaterThan(String value) {
-            addCriterion("VOI_PRODUCT_NAME >", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameGreaterThanOrEqualTo(String value) {
-            addCriterion("VOI_PRODUCT_NAME >=", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameLessThan(String value) {
-            addCriterion("VOI_PRODUCT_NAME <", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameLessThanOrEqualTo(String value) {
-            addCriterion("VOI_PRODUCT_NAME <=", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameLike(String value) {
-            addCriterion("VOI_PRODUCT_NAME like", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameNotLike(String value) {
-            addCriterion("VOI_PRODUCT_NAME not like", value, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameIn(List<String> values) {
-            addCriterion("VOI_PRODUCT_NAME in", values, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameNotIn(List<String> values) {
-            addCriterion("VOI_PRODUCT_NAME not in", values, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameBetween(String value1, String value2) {
-            addCriterion("VOI_PRODUCT_NAME between", value1, value2, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductNameNotBetween(String value1, String value2) {
-            addCriterion("VOI_PRODUCT_NAME not between", value1, value2, "productName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdIsNull() {
-            addCriterion("VOI_PRODUCT_ID is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdIsNotNull() {
-            addCriterion("VOI_PRODUCT_ID is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdEqualTo(String value) {
-            if(value == null ){
-                andProductIdIsNull();
-            } else {
-                addCriterion("VOI_PRODUCT_ID =", value, "productId");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdNotEqualTo(String value) {
-            if(value == null ){
-                andProductIdIsNotNull();
-            } else {
-                addCriterion("VOI_PRODUCT_ID <>", value, "productId");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdGreaterThan(String value) {
-            addCriterion("VOI_PRODUCT_ID >", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdGreaterThanOrEqualTo(String value) {
-            addCriterion("VOI_PRODUCT_ID >=", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdLessThan(String value) {
-            addCriterion("VOI_PRODUCT_ID <", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdLessThanOrEqualTo(String value) {
-            addCriterion("VOI_PRODUCT_ID <=", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdLike(String value) {
-            addCriterion("VOI_PRODUCT_ID like", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdNotLike(String value) {
-            addCriterion("VOI_PRODUCT_ID not like", value, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdIn(List<String> values) {
-            addCriterion("VOI_PRODUCT_ID in", values, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdNotIn(List<String> values) {
-            addCriterion("VOI_PRODUCT_ID not in", values, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdBetween(String value1, String value2) {
-            addCriterion("VOI_PRODUCT_ID between", value1, value2, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductIdNotBetween(String value1, String value2) {
-            addCriterion("VOI_PRODUCT_ID not between", value1, value2, "productId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdIsNull() {
-            addCriterion("VOI_EQUREL_ID is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdIsNotNull() {
-            addCriterion("VOI_EQUREL_ID is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdEqualTo(String value) {
-            if(value == null ){
-                andEqurelIdIsNull();
-            } else {
-                addCriterion("VOI_EQUREL_ID =", value, "equrelId");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdNotEqualTo(String value) {
-            if(value == null ){
-                andEqurelIdIsNotNull();
-            } else {
-                addCriterion("VOI_EQUREL_ID <>", value, "equrelId");
-            }
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdGreaterThan(String value) {
-            addCriterion("VOI_EQUREL_ID >", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdGreaterThanOrEqualTo(String value) {
-            addCriterion("VOI_EQUREL_ID >=", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdLessThan(String value) {
-            addCriterion("VOI_EQUREL_ID <", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdLessThanOrEqualTo(String value) {
-            addCriterion("VOI_EQUREL_ID <=", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdLike(String value) {
-            addCriterion("VOI_EQUREL_ID like", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdNotLike(String value) {
-            addCriterion("VOI_EQUREL_ID not like", value, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdIn(List<String> values) {
-            addCriterion("VOI_EQUREL_ID in", values, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdNotIn(List<String> values) {
-            addCriterion("VOI_EQUREL_ID not in", values, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdBetween(String value1, String value2) {
-            addCriterion("VOI_EQUREL_ID between", value1, value2, "equrelId");
-            return (Criteria) this;
-        }
-
-        public Criteria andEqurelIdNotBetween(String value1, String value2) {
-            addCriterion("VOI_EQUREL_ID not between", value1, value2, "equrelId");
-            return (Criteria) this;
-        }
-
         public Criteria andOperationIsNull() {
             addCriterion("VOI_OPERATION is null");
             return (Criteria) this;

+ 18 - 18
src/main/resources/com/minpay/db/table/mapper/VmOrderDetailsMapper.xml

@@ -9,8 +9,8 @@
     <id column="VOD_DETAILS_ID" jdbcType="VARCHAR" property="detailsId" />
     <result column="VOD_CHANNEL" jdbcType="VARCHAR" property="channel" />
     <result column="VOD_ORDER_ID" jdbcType="VARCHAR" property="orderId" />
-    <result column="VOD_CARGO_WAY" jdbcType="VARCHAR" property="cargoWay" />
     <result column="VOD_PRO_EQU_REL_ID" jdbcType="VARCHAR" property="proEquRelId" />
+    <result column="VOD_CARGO_WAY" jdbcType="VARCHAR" property="cargoWay" />
     <result column="VOD_PRODUCT_ID" jdbcType="VARCHAR" property="productId" />
     <result column="VOD_PRO_TYPE" jdbcType="VARCHAR" property="proType" />
     <result column="VOD_PRO_NAME" jdbcType="VARCHAR" property="proName" />
@@ -95,7 +95,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    VOD_DETAILS_ID, VOD_CHANNEL, VOD_ORDER_ID, VOD_CARGO_WAY, VOD_PRO_EQU_REL_ID, VOD_PRODUCT_ID, 
+    VOD_DETAILS_ID, VOD_CHANNEL, VOD_ORDER_ID, VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
     VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
     VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME
   </sql>
@@ -151,13 +151,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into vm_order_details (VOD_DETAILS_ID, VOD_CHANNEL, VOD_ORDER_ID, 
-      VOD_CARGO_WAY, VOD_PRO_EQU_REL_ID, VOD_PRODUCT_ID, 
+      VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
       VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, 
       VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
       VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, 
       VOD_MODIFY_USER, VOD_MODIFY_TIME)
     values (#{detailsId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, 
-      #{cargoWay,jdbcType=VARCHAR}, #{proEquRelId,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
+      #{proEquRelId,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
       #{proType,jdbcType=VARCHAR}, #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, 
       #{proNums,jdbcType=VARCHAR}, #{amount,jdbcType=VARCHAR}, #{recordId,jdbcType=VARCHAR}, 
       #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
@@ -179,12 +179,12 @@
       <if test="orderId != null">
         VOD_ORDER_ID,
       </if>
-      <if test="cargoWay != null">
-        VOD_CARGO_WAY,
-      </if>
       <if test="proEquRelId != null">
         VOD_PRO_EQU_REL_ID,
       </if>
+      <if test="cargoWay != null">
+        VOD_CARGO_WAY,
+      </if>
       <if test="productId != null">
         VOD_PRODUCT_ID,
       </if>
@@ -232,12 +232,12 @@
       <if test="orderId != null">
         #{orderId,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWay != null">
-        #{cargoWay,jdbcType=VARCHAR},
-      </if>
       <if test="proEquRelId != null">
         #{proEquRelId,jdbcType=VARCHAR},
       </if>
+      <if test="cargoWay != null">
+        #{cargoWay,jdbcType=VARCHAR},
+      </if>
       <if test="productId != null">
         #{productId,jdbcType=VARCHAR},
       </if>
@@ -302,12 +302,12 @@
       <if test="record.orderId != null">
         VOD_ORDER_ID = #{record.orderId,jdbcType=VARCHAR},
       </if>
-      <if test="record.cargoWay != null">
-        VOD_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
-      </if>
       <if test="record.proEquRelId != null">
         VOD_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR},
       </if>
+      <if test="record.cargoWay != null">
+        VOD_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
+      </if>
       <if test="record.productId != null">
         VOD_PRODUCT_ID = #{record.productId,jdbcType=VARCHAR},
       </if>
@@ -358,8 +358,8 @@
     set VOD_DETAILS_ID = #{record.detailsId,jdbcType=VARCHAR},
       VOD_CHANNEL = #{record.channel,jdbcType=VARCHAR},
       VOD_ORDER_ID = #{record.orderId,jdbcType=VARCHAR},
-      VOD_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
       VOD_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR},
+      VOD_CARGO_WAY = #{record.cargoWay,jdbcType=VARCHAR},
       VOD_PRODUCT_ID = #{record.productId,jdbcType=VARCHAR},
       VOD_PRO_TYPE = #{record.proType,jdbcType=VARCHAR},
       VOD_PRO_NAME = #{record.proName,jdbcType=VARCHAR},
@@ -389,12 +389,12 @@
       <if test="orderId != null">
         VOD_ORDER_ID = #{orderId,jdbcType=VARCHAR},
       </if>
-      <if test="cargoWay != null">
-        VOD_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
-      </if>
       <if test="proEquRelId != null">
         VOD_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR},
       </if>
+      <if test="cargoWay != null">
+        VOD_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
+      </if>
       <if test="productId != null">
         VOD_PRODUCT_ID = #{productId,jdbcType=VARCHAR},
       </if>
@@ -442,8 +442,8 @@
     update vm_order_details
     set VOD_CHANNEL = #{channel,jdbcType=VARCHAR},
       VOD_ORDER_ID = #{orderId,jdbcType=VARCHAR},
-      VOD_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
       VOD_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR},
+      VOD_CARGO_WAY = #{cargoWay,jdbcType=VARCHAR},
       VOD_PRODUCT_ID = #{productId,jdbcType=VARCHAR},
       VOD_PRO_TYPE = #{proType,jdbcType=VARCHAR},
       VOD_PRO_NAME = #{proName,jdbcType=VARCHAR},

+ 3 - 50
src/main/resources/com/minpay/db/table/mapper/VmOrderInfMapper.xml

@@ -31,9 +31,6 @@
     <result column="VOI_PICKUP_TIME" jdbcType="VARCHAR" property="pickupTime" />
     <result column="VOI_BRANCHID" jdbcType="VARCHAR" property="branchid" />
     <result column="VOI_PAY_MODE" jdbcType="VARCHAR" property="payMode" />
-    <result column="VOI_PRODUCT_NAME" jdbcType="VARCHAR" property="productName" />
-    <result column="VOI_PRODUCT_ID" jdbcType="VARCHAR" property="productId" />
-    <result column="VOI_EQUREL_ID" jdbcType="VARCHAR" property="equrelId" />
     <result column="VOI_OPERATION" jdbcType="VARCHAR" property="operation" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -111,7 +108,7 @@
     VOI_PAY_ORDERNO, VOI_REMARKS, VOI_PAY_TYPE, VOI_NUMBER, VOI_PRO_TYPE, VOI_IS_DRAW, 
     VOI_IS_USED, VOI_PRO_STATE, VOI_DRAW_PRICE, VOI_CREATE_USER, VOI_CREATE_TIME, VOI_MODIFY_USER, 
     VOI_MODIFY_TIME, VOI_PICKUP_NO, VOI_PICKUP_STT, VOI_PICKUP_TIME, VOI_BRANCHID, VOI_PAY_MODE, 
-    VOI_PRODUCT_NAME, VOI_PRODUCT_ID, VOI_EQUREL_ID, VOI_OPERATION
+    VOI_OPERATION
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderInfExample" resultMap="BaseResultMap">
     <!--
@@ -172,8 +169,7 @@
       VOI_DRAW_PRICE, VOI_CREATE_USER, VOI_CREATE_TIME, 
       VOI_MODIFY_USER, VOI_MODIFY_TIME, VOI_PICKUP_NO, 
       VOI_PICKUP_STT, VOI_PICKUP_TIME, VOI_BRANCHID, 
-      VOI_PAY_MODE, VOI_PRODUCT_NAME, VOI_PRODUCT_ID, 
-      VOI_EQUREL_ID, VOI_OPERATION)
+      VOI_PAY_MODE, VOI_OPERATION)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{personId,jdbcType=VARCHAR}, 
       #{equipmentId,jdbcType=VARCHAR}, #{orderAmt,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
       #{recordId,jdbcType=VARCHAR}, #{payOrderno,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
@@ -182,8 +178,7 @@
       #{drawPrice,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
       #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, #{pickupNo,jdbcType=VARCHAR}, 
       #{pickupStt,jdbcType=VARCHAR}, #{pickupTime,jdbcType=VARCHAR}, #{branchid,jdbcType=VARCHAR}, 
-      #{payMode,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
-      #{equrelId,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR})
+      #{payMode,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderInf">
     <!--
@@ -267,15 +262,6 @@
       <if test="payMode != null">
         VOI_PAY_MODE,
       </if>
-      <if test="productName != null">
-        VOI_PRODUCT_NAME,
-      </if>
-      <if test="productId != null">
-        VOI_PRODUCT_ID,
-      </if>
-      <if test="equrelId != null">
-        VOI_EQUREL_ID,
-      </if>
       <if test="operation != null">
         VOI_OPERATION,
       </if>
@@ -356,15 +342,6 @@
       <if test="payMode != null">
         #{payMode,jdbcType=VARCHAR},
       </if>
-      <if test="productName != null">
-        #{productName,jdbcType=VARCHAR},
-      </if>
-      <if test="productId != null">
-        #{productId,jdbcType=VARCHAR},
-      </if>
-      <if test="equrelId != null">
-        #{equrelId,jdbcType=VARCHAR},
-      </if>
       <if test="operation != null">
         #{operation,jdbcType=VARCHAR},
       </if>
@@ -462,15 +439,6 @@
       <if test="record.payMode != null">
         VOI_PAY_MODE = #{record.payMode,jdbcType=VARCHAR},
       </if>
-      <if test="record.productName != null">
-        VOI_PRODUCT_NAME = #{record.productName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.productId != null">
-        VOI_PRODUCT_ID = #{record.productId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.equrelId != null">
-        VOI_EQUREL_ID = #{record.equrelId,jdbcType=VARCHAR},
-      </if>
       <if test="record.operation != null">
         VOI_OPERATION = #{record.operation,jdbcType=VARCHAR},
       </if>
@@ -510,9 +478,6 @@
       VOI_PICKUP_TIME = #{record.pickupTime,jdbcType=VARCHAR},
       VOI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{record.payMode,jdbcType=VARCHAR},
-      VOI_PRODUCT_NAME = #{record.productName,jdbcType=VARCHAR},
-      VOI_PRODUCT_ID = #{record.productId,jdbcType=VARCHAR},
-      VOI_EQUREL_ID = #{record.equrelId,jdbcType=VARCHAR},
       VOI_OPERATION = #{record.operation,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -597,15 +562,6 @@
       <if test="payMode != null">
         VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR},
       </if>
-      <if test="productName != null">
-        VOI_PRODUCT_NAME = #{productName,jdbcType=VARCHAR},
-      </if>
-      <if test="productId != null">
-        VOI_PRODUCT_ID = #{productId,jdbcType=VARCHAR},
-      </if>
-      <if test="equrelId != null">
-        VOI_EQUREL_ID = #{equrelId,jdbcType=VARCHAR},
-      </if>
       <if test="operation != null">
         VOI_OPERATION = #{operation,jdbcType=VARCHAR},
       </if>
@@ -642,9 +598,6 @@
       VOI_PICKUP_TIME = #{pickupTime,jdbcType=VARCHAR},
       VOI_BRANCHID = #{branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR},
-      VOI_PRODUCT_NAME = #{productName,jdbcType=VARCHAR},
-      VOI_PRODUCT_ID = #{productId,jdbcType=VARCHAR},
-      VOI_EQUREL_ID = #{equrelId,jdbcType=VARCHAR},
       VOI_OPERATION = #{operation,jdbcType=VARCHAR}
     where VOI_ID = #{id,jdbcType=VARCHAR}
   </update>