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

hai-order/src/main/java/com/web/controller/notify/GroupOrderController.java

@@ -47,7 +47,6 @@ public class GroupOrderController {
                                        @RequestParam(name = "storeId", required = false) String storeId) {
         try {
 
-
             log.info("============回调任务Start=============");
             log.info("团购订单-回调参数: " + groupCode);
 
@@ -77,6 +76,8 @@ public class GroupOrderController {
 
 
             highGroupOrder.setStatus(3);
+            highGroupOrder.setTransfer(2);
+            highGroupOrder.setPrice(highOrder.getPayPrice());
             highGroupOrder.setUpdateTime(new Date());  
             groupCodeService.updateGroupOrder(highGroupOrder);
 

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

@@ -40,12 +40,14 @@ public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
 
     @Insert({
         "insert into high_group_order (order_no, group_id, ",
-        "store_id, mer_no, create_time, ",
+        "store_id, mer_no, price, ",
+        "transfer, create_time, ",
         "update_time, `status`, ",
         "op_id, op_name, ext_1, ",
         "ext_2, ext_3)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{groupId,jdbcType=BIGINT}, ",
-        "#{storeId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{storeId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, ",
+        "#{transfer,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
         "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
         "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
         "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
@@ -64,6 +66,8 @@ public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
         @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
         @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="transfer", property="transfer", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@@ -77,8 +81,8 @@ public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
 
     @Select({
         "select",
-        "id, order_no, group_id, store_id, mer_no, create_time, update_time, `status`, ",
+        "id, order_no, group_id, store_id, mer_no, price, transfer, create_time, update_time, ",
-        "op_id, op_name, ext_1, ext_2, ext_3",
+        "`status`, op_id, op_name, ext_1, ext_2, ext_3",
         "from high_group_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -88,6 +92,8 @@ public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
         @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
         @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="transfer", property="transfer", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@@ -114,6 +120,8 @@ public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
           "group_id = #{groupId,jdbcType=BIGINT},",
           "store_id = #{storeId,jdbcType=BIGINT},",
           "mer_no = #{merNo,jdbcType=VARCHAR},",
+          "price = #{price,jdbcType=DECIMAL},",
+          "transfer = #{transfer,jdbcType=INTEGER},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
           "`status` = #{status,jdbcType=INTEGER},",

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

@@ -44,6 +44,14 @@ public class HighGroupOrderSqlProvider {
             sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getPrice() != null) {
+            sql.VALUES("price", "#{price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTransfer() != null) {
+            sql.VALUES("transfer", "#{transfer,jdbcType=INTEGER}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
         }
@@ -90,6 +98,8 @@ public class HighGroupOrderSqlProvider {
         sql.SELECT("group_id");
         sql.SELECT("store_id");
         sql.SELECT("mer_no");
+        sql.SELECT("price");
+        sql.SELECT("transfer");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
         sql.SELECT("`status`");
@@ -135,6 +145,14 @@ public class HighGroupOrderSqlProvider {
             sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getPrice() != null) {
+            sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTransfer() != null) {
+            sql.SET("transfer = #{record.transfer,jdbcType=INTEGER}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         }
@@ -180,6 +198,8 @@ public class HighGroupOrderSqlProvider {
         sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}");
         sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
         sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}");
+        sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        sql.SET("transfer = #{record.transfer,jdbcType=INTEGER}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
@@ -214,6 +234,14 @@ public class HighGroupOrderSqlProvider {
             sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getPrice() != null) {
+            sql.SET("price = #{price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getTransfer() != null) {
+            sql.SET("transfer = #{transfer,jdbcType=INTEGER}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
         }

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

@@ -1,6 +1,7 @@
 package com.hai.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -38,6 +39,16 @@ public class HighGroupOrder implements Serializable {
      */
     private String merNo;
 
+    /**
+     * 金额
+     */
+    private BigDecimal price;
+
+    /**
+     * 是否转账 1：是 2 否
+     */
+    private Integer transfer;
+
     /**
      * 创建时间
      */
@@ -120,6 +131,22 @@ public class HighGroupOrder implements Serializable {
         this.merNo = merNo;
     }
 
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public Integer getTransfer() {
+        return transfer;
+    }
+
+    public void setTransfer(Integer transfer) {
+        this.transfer = transfer;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -201,6 +228,8 @@ public class HighGroupOrder implements Serializable {
             && (this.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId()))
             && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
             && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo()))
+            && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
+            && (this.getTransfer() == null ? other.getTransfer() == null : this.getTransfer().equals(other.getTransfer()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
@@ -220,6 +249,8 @@ public class HighGroupOrder implements Serializable {
         result = prime * result + ((getGroupId() == null) ? 0 : getGroupId().hashCode());
         result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
         result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode());
+        result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
+        result = prime * result + ((getTransfer() == null) ? 0 : getTransfer().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
@@ -242,6 +273,8 @@ public class HighGroupOrder implements Serializable {
         sb.append(", groupId=").append(groupId);
         sb.append(", storeId=").append(storeId);
         sb.append(", merNo=").append(merNo);
+        sb.append(", price=").append(price);
+        sb.append(", transfer=").append(transfer);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", status=").append(status);

hai-service/src/main/java/com/hai/entity/HighGroupOrderExample.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;
@@ -445,6 +446,126 @@ public class HighGroupOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andPriceIsNull() {
+            addCriterion("price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIsNotNull() {
+            addCriterion("price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceEqualTo(BigDecimal value) {
+            addCriterion("price =", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotEqualTo(BigDecimal value) {
+            addCriterion("price <>", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThan(BigDecimal value) {
+            addCriterion("price >", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("price >=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThan(BigDecimal value) {
+            addCriterion("price <", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("price <=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIn(List<BigDecimal> values) {
+            addCriterion("price in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotIn(List<BigDecimal> values) {
+            addCriterion("price not in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("price between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("price not between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIsNull() {
+            addCriterion("transfer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIsNotNull() {
+            addCriterion("transfer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferEqualTo(Integer value) {
+            addCriterion("transfer =", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNotEqualTo(Integer value) {
+            addCriterion("transfer <>", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferGreaterThan(Integer value) {
+            addCriterion("transfer >", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferGreaterThanOrEqualTo(Integer value) {
+            addCriterion("transfer >=", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferLessThan(Integer value) {
+            addCriterion("transfer <", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferLessThanOrEqualTo(Integer value) {
+            addCriterion("transfer <=", value, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferIn(List<Integer> values) {
+            addCriterion("transfer in", values, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNotIn(List<Integer> values) {
+            addCriterion("transfer not in", values, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferBetween(Integer value1, Integer value2) {
+            addCriterion("transfer between", value1, value2, "transfer");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransferNotBetween(Integer value1, Integer value2) {
+            addCriterion("transfer not between", value1, value2, "transfer");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;