Merge branch '2.0-master' into 2.0-dev

# Conflicts:
#	hai-order/src/main/java/com/web/controller/OrderPayController.java
#	hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
#	hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
#	hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
#	hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
#	hai-service/src/main/java/com/hai/order/type/OrderChildGoodsType.java
#	hai-service/src/main/java/com/hai/order/type/OrderProductType.java

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -141,6 +141,7 @@ public class OrderPayController {
             // 微信支付
             String nonce_str = MD5Util.MD5Encode(String.valueOf(ThreadLocalRandom.current().nextInt(10000)), "UTF-8");
             int total_fee = order.getPayPrice().multiply(new BigDecimal("100")).intValue();
+            BigDecimal totalAmount = order.getPayPrice();
             WeChatPayReqInfo weChatPayReqInfo = new WeChatPayReqInfo();
             weChatPayReqInfo.setAppid(SysConst.getSysConfig().getWxPayMchAppId());                                // 公众号id
             weChatPayReqInfo.setMch_id(SysConst.getSysConfig().getWxPayMchId());                                  // 商户号
@@ -315,6 +316,7 @@ public class OrderPayController {
 
                     } else if (store.getSourceType().equals(MerchantStoreSourceType.type7.getNumber())) {
 
+                        totalAmount = order.getTotalPrice();
                         // 查询支付配置
                         HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type7);
                         if (gasChannelConfig == null) {
@@ -355,7 +357,9 @@ public class OrderPayController {
 
                 } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE16.getNumber())) {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
-                } else {
+                } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE17.getNumber())) {
+                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
+                }  else {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1609882817);
                 }
             }
@@ -381,7 +385,7 @@ public class OrderPayController {
                 objectGas.put("outTradeNo" , order.getOrderNo());
                 objectGas.put("transType" , "JSAPI");
                 objectGas.put("payMode" , "WECHAT");
-                objectGas.put("totalAmount" , order.getTotalPrice());
+                objectGas.put("totalAmount" , totalAmount);
                 objectGas.put("profitSharing" , 0);
                 objectGas.put("notifyUrl" , SysConst.getSysConfig().getHuiPayNotify());
                 objectGas.put("subject" , orderTitle);

hai-service/src/main/java/com/hai/common/GenerateCode.java

@@ -14,6 +14,7 @@ public class GenerateCode {
     private static final Random RANDOM = new SecureRandom();
 
     private static final String SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    private static final String SYMBOLSNUM = "0123456789";
 
     /**
      * @Author 胡锐
@@ -56,4 +57,15 @@ public class GenerateCode {
         return new String(nonceChars) + couponAgentRelId;
     }
 
+    public static String convertCode(Long couponAgentRelId , Integer length) {
+        // 需要生成的长度
+        int generateLength = length - couponAgentRelId.toString().length();
+
+        char[] nonceChars = new char[generateLength];
+        for (int index = 0; index < nonceChars.length; ++index) {
+            nonceChars[index] = SYMBOLSNUM.charAt(RANDOM.nextInt(SYMBOLSNUM.length()));
+        }
+        return new String(nonceChars) + couponAgentRelId;
+    }
+
 }

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

@@ -0,0 +1,16 @@
+package com.hai.config;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @serviceName .java
+ * @author Sum1Dream
+ * @version 1.0.0
+ * @Description // 四川中石油
+ * @createTime 18:33 2023/11/13
+ **/
+@Component
+public class ScPetroConfig {
+
+
+}

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

@@ -0,0 +1,141 @@
+package com.hai.dao;
+
+import com.hai.entity.HighGroupCode;
+import com.hai.entity.HighGroupCodeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface HighGroupCodeMapper extends HighGroupCodeMapperExt {
+    @SelectProvider(type=HighGroupCodeSqlProvider.class, method="countByExample")
+    long countByExample(HighGroupCodeExample example);
+
+    @DeleteProvider(type=HighGroupCodeSqlProvider.class, method="deleteByExample")
+    int deleteByExample(HighGroupCodeExample example);
+
+    @Delete({
+        "delete from high_group_code",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into high_group_code (user_id, order_id, ",
+        "srore_id, group_id, ",
+        "group_code, code_img_url, ",
+        "expiration_time, create_time, ",
+        "update_time, `status`, ",
+        "op_id, op_name, ext_1, ",
+        "ext_2, ext_3)",
+        "values (#{userId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, ",
+        "#{sroreId,jdbcType=BIGINT}, #{groupId,jdbcType=BIGINT}, ",
+        "#{groupCode,jdbcType=VARCHAR}, #{codeImgUrl,jdbcType=VARCHAR}, ",
+        "#{expirationTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
+        "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(HighGroupCode record);
+
+    @InsertProvider(type=HighGroupCodeSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(HighGroupCode record);
+
+    @SelectProvider(type=HighGroupCodeSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
+        @Result(column="srore_id", property="sroreId", jdbcType=JdbcType.BIGINT),
+        @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
+        @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="expiration_time", property="expirationTime", jdbcType=JdbcType.TIMESTAMP),
+        @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),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    List<HighGroupCode> selectByExample(HighGroupCodeExample example);
+
+    @Select({
+        "select",
+        "id, user_id, order_id, srore_id, group_id, group_code, code_img_url, expiration_time, ",
+        "create_time, update_time, `status`, op_id, op_name, ext_1, ext_2, ext_3",
+        "from high_group_code",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
+        @Result(column="srore_id", property="sroreId", jdbcType=JdbcType.BIGINT),
+        @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
+        @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR),
+        @Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR),
+        @Result(column="expiration_time", property="expirationTime", jdbcType=JdbcType.TIMESTAMP),
+        @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),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    HighGroupCode selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=HighGroupCodeSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") HighGroupCode record, @Param("example") HighGroupCodeExample example);
+
+    @UpdateProvider(type=HighGroupCodeSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") HighGroupCode record, @Param("example") HighGroupCodeExample example);
+
+    @UpdateProvider(type=HighGroupCodeSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(HighGroupCode record);
+
+    @Update({
+        "update high_group_code",
+        "set user_id = #{userId,jdbcType=BIGINT},",
+          "order_id = #{orderId,jdbcType=BIGINT},",
+          "srore_id = #{sroreId,jdbcType=BIGINT},",
+          "group_id = #{groupId,jdbcType=BIGINT},",
+          "group_code = #{groupCode,jdbcType=VARCHAR},",
+          "code_img_url = #{codeImgUrl,jdbcType=VARCHAR},",
+          "expiration_time = #{expirationTime,jdbcType=TIMESTAMP},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "op_id = #{opId,jdbcType=BIGINT},",
+          "op_name = #{opName,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(HighGroupCode record);
+}

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

@@ -0,0 +1,7 @@
+package com.hai.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface HighGroupCodeMapperExt {
+}

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

@@ -0,0 +1,388 @@
+package com.hai.dao;
+
+import com.hai.entity.HighGroupCode;
+import com.hai.entity.HighGroupCodeExample.Criteria;
+import com.hai.entity.HighGroupCodeExample.Criterion;
+import com.hai.entity.HighGroupCodeExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class HighGroupCodeSqlProvider {
+
+    public String countByExample(HighGroupCodeExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("high_group_code");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(HighGroupCodeExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("high_group_code");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(HighGroupCode record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("high_group_code");
+        
+        if (record.getUserId() != null) {
+            sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderId() != null) {
+            sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getSroreId() != null) {
+            sql.VALUES("srore_id", "#{sroreId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.VALUES("group_id", "#{groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupCode() != null) {
+            sql.VALUES("group_code", "#{groupCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCodeImgUrl() != null) {
+            sql.VALUES("code_img_url", "#{codeImgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExpirationTime() != null) {
+            sql.VALUES("expiration_time", "#{expirationTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.VALUES("op_name", "#{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(HighGroupCodeExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("user_id");
+        sql.SELECT("order_id");
+        sql.SELECT("srore_id");
+        sql.SELECT("group_id");
+        sql.SELECT("group_code");
+        sql.SELECT("code_img_url");
+        sql.SELECT("expiration_time");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("`status`");
+        sql.SELECT("op_id");
+        sql.SELECT("op_name");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("high_group_code");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        HighGroupCode record = (HighGroupCode) parameter.get("record");
+        HighGroupCodeExample example = (HighGroupCodeExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_code");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderId() != null) {
+            sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getSroreId() != null) {
+            sql.SET("srore_id = #{record.sroreId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupCode() != null) {
+            sql.SET("group_code = #{record.groupCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCodeImgUrl() != null) {
+            sql.SET("code_img_url = #{record.codeImgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExpirationTime() != null) {
+            sql.SET("expiration_time = #{record.expirationTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_code");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
+        sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
+        sql.SET("srore_id = #{record.sroreId,jdbcType=BIGINT}");
+        sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}");
+        sql.SET("group_code = #{record.groupCode,jdbcType=VARCHAR}");
+        sql.SET("code_img_url = #{record.codeImgUrl,jdbcType=VARCHAR}");
+        sql.SET("expiration_time = #{record.expirationTime,jdbcType=TIMESTAMP}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        HighGroupCodeExample example = (HighGroupCodeExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(HighGroupCode record) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_code");
+        
+        if (record.getUserId() != null) {
+            sql.SET("user_id = #{userId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderId() != null) {
+            sql.SET("order_id = #{orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getSroreId() != null) {
+            sql.SET("srore_id = #{sroreId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.SET("group_id = #{groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getGroupCode() != null) {
+            sql.SET("group_code = #{groupCode,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getCodeImgUrl() != null) {
+            sql.SET("code_img_url = #{codeImgUrl,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExpirationTime() != null) {
+            sql.SET("expiration_time = #{expirationTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, HighGroupCodeExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

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

@@ -0,0 +1,125 @@
+package com.hai.dao;
+
+import com.hai.entity.HighGroupOrder;
+import com.hai.entity.HighGroupOrderExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface HighGroupOrderMapper extends HighGroupOrderMapperExt {
+    @SelectProvider(type=HighGroupOrderSqlProvider.class, method="countByExample")
+    long countByExample(HighGroupOrderExample example);
+
+    @DeleteProvider(type=HighGroupOrderSqlProvider.class, method="deleteByExample")
+    int deleteByExample(HighGroupOrderExample example);
+
+    @Delete({
+        "delete from high_group_order",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into high_group_order (order_no, group_id, ",
+        "store_id, 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}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
+        "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(HighGroupOrder record);
+
+    @InsertProvider(type=HighGroupOrderSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(HighGroupOrder record);
+
+    @SelectProvider(type=HighGroupOrderSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
+        @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
+        @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),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    List<HighGroupOrder> selectByExample(HighGroupOrderExample example);
+
+    @Select({
+        "select",
+        "id, order_no, group_id, store_id, create_time, update_time, `status`, op_id, ",
+        "op_name, ext_1, ext_2, ext_3",
+        "from high_group_order",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT),
+        @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
+        @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),
+        @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
+    })
+    HighGroupOrder selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=HighGroupOrderSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") HighGroupOrder record, @Param("example") HighGroupOrderExample example);
+
+    @UpdateProvider(type=HighGroupOrderSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") HighGroupOrder record, @Param("example") HighGroupOrderExample example);
+
+    @UpdateProvider(type=HighGroupOrderSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(HighGroupOrder record);
+
+    @Update({
+        "update high_group_order",
+        "set order_no = #{orderNo,jdbcType=VARCHAR},",
+          "group_id = #{groupId,jdbcType=BIGINT},",
+          "store_id = #{storeId,jdbcType=BIGINT},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "op_id = #{opId,jdbcType=BIGINT},",
+          "op_name = #{opName,jdbcType=VARCHAR},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(HighGroupOrder record);
+}

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

@@ -0,0 +1,7 @@
+package com.hai.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface HighGroupOrderMapperExt {
+}

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

@@ -0,0 +1,332 @@
+package com.hai.dao;
+
+import com.hai.entity.HighGroupOrder;
+import com.hai.entity.HighGroupOrderExample.Criteria;
+import com.hai.entity.HighGroupOrderExample.Criterion;
+import com.hai.entity.HighGroupOrderExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class HighGroupOrderSqlProvider {
+
+    public String countByExample(HighGroupOrderExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("high_group_order");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(HighGroupOrderExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("high_group_order");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(HighGroupOrder record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("high_group_order");
+        
+        if (record.getOrderNo() != null) {
+            sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.VALUES("group_id", "#{groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getStoreId() != null) {
+            sql.VALUES("store_id", "#{storeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.VALUES("op_name", "#{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(HighGroupOrderExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("order_no");
+        sql.SELECT("group_id");
+        sql.SELECT("store_id");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("`status`");
+        sql.SELECT("op_id");
+        sql.SELECT("op_name");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("high_group_order");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        HighGroupOrder record = (HighGroupOrder) parameter.get("record");
+        HighGroupOrderExample example = (HighGroupOrderExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_order");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getStoreId() != null) {
+            sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_order");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
+        sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}");
+        sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
+        sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        HighGroupOrderExample example = (HighGroupOrderExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(HighGroupOrder record) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_group_order");
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getGroupId() != null) {
+            sql.SET("group_id = #{groupId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getStoreId() != null) {
+            sql.SET("store_id = #{storeId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getOpId() != null) {
+            sql.SET("op_id = #{opId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpName() != null) {
+            sql.SET("op_name = #{opName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt1() != null) {
+            sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt2() != null) {
+            sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getExt3() != null) {
+            sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, HighGroupOrderExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

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

@@ -0,0 +1,305 @@
+package com.hai.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * high_group_code
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class HighGroupCode implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户编码
+     */
+    private Long userId;
+
+    /**
+     * 订单Id
+     */
+    private Long orderId;
+
+    /**
+     * 门店ID
+     */
+    private Long sroreId;
+
+    /**
+     * 团购ID
+     */
+    private Long groupId;
+
+    /**
+     * 二维码编码
+     */
+    private String groupCode;
+
+    /**
+     * 二维码图片地址
+     */
+    private String codeImgUrl;
+
+    /**
+     * 到期日期
+     */
+    private Date expirationTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态 1：正常 2：已使用 3：过期
+     */
+    private Integer status;
+
+    /**
+     * 操作人
+     */
+    private Long opId;
+
+    /**
+     * 操作人名称
+     */
+    private String opName;
+
+    /**
+     * ext_1
+     */
+    private String ext1;
+
+    /**
+     * ext_2
+     */
+    private String ext2;
+
+    /**
+     * ext_3
+     */
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getSroreId() {
+        return sroreId;
+    }
+
+    public void setSroreId(Long sroreId) {
+        this.sroreId = sroreId;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getCodeImgUrl() {
+        return codeImgUrl;
+    }
+
+    public void setCodeImgUrl(String codeImgUrl) {
+        this.codeImgUrl = codeImgUrl;
+    }
+
+    public Date getExpirationTime() {
+        return expirationTime;
+    }
+
+    public void setExpirationTime(Date expirationTime) {
+        this.expirationTime = expirationTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOpId() {
+        return opId;
+    }
+
+    public void setOpId(Long opId) {
+        this.opId = opId;
+    }
+
+    public String getOpName() {
+        return opName;
+    }
+
+    public void setOpName(String opName) {
+        this.opName = opName;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        HighGroupCode other = (HighGroupCode) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
+            && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
+            && (this.getSroreId() == null ? other.getSroreId() == null : this.getSroreId().equals(other.getSroreId()))
+            && (this.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId()))
+            && (this.getGroupCode() == null ? other.getGroupCode() == null : this.getGroupCode().equals(other.getGroupCode()))
+            && (this.getCodeImgUrl() == null ? other.getCodeImgUrl() == null : this.getCodeImgUrl().equals(other.getCodeImgUrl()))
+            && (this.getExpirationTime() == null ? other.getExpirationTime() == null : this.getExpirationTime().equals(other.getExpirationTime()))
+            && (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()))
+            && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
+            && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
+        result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
+        result = prime * result + ((getSroreId() == null) ? 0 : getSroreId().hashCode());
+        result = prime * result + ((getGroupId() == null) ? 0 : getGroupId().hashCode());
+        result = prime * result + ((getGroupCode() == null) ? 0 : getGroupCode().hashCode());
+        result = prime * result + ((getCodeImgUrl() == null) ? 0 : getCodeImgUrl().hashCode());
+        result = prime * result + ((getExpirationTime() == null) ? 0 : getExpirationTime().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());
+        result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
+        result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", userId=").append(userId);
+        sb.append(", orderId=").append(orderId);
+        sb.append(", sroreId=").append(sroreId);
+        sb.append(", groupId=").append(groupId);
+        sb.append(", groupCode=").append(groupCode);
+        sb.append(", codeImgUrl=").append(codeImgUrl);
+        sb.append(", expirationTime=").append(expirationTime);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", status=").append(status);
+        sb.append(", opId=").append(opId);
+        sb.append(", opName=").append(opName);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,241 @@
+package com.hai.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * high_group_order
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class HighGroupOrder implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 团购id
+     */
+    private Long groupId;
+
+    /**
+     * 门店Id
+     */
+    private Long storeId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 操作人
+     */
+    private Long opId;
+
+    /**
+     * 操作人名称
+     */
+    private String opName;
+
+    /**
+     * ext_1
+     */
+    private String ext1;
+
+    /**
+     * ext_2
+     */
+    private String ext2;
+
+    /**
+     * ext_3
+     */
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getOpId() {
+        return opId;
+    }
+
+    public void setOpId(Long opId) {
+        this.opId = opId;
+    }
+
+    public String getOpName() {
+        return opName;
+    }
+
+    public void setOpName(String opName) {
+        this.opName = opName;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1;
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2;
+    }
+
+    public String getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(String ext3) {
+        this.ext3 = ext3;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        HighGroupOrder other = (HighGroupOrder) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+            && (this.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId()))
+            && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
+            && (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()))
+            && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
+            && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
+            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
+            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+        result = prime * result + ((getGroupId() == null) ? 0 : getGroupId().hashCode());
+        result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().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());
+        result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
+        result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
+        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
+        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
+        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", groupId=").append(groupId);
+        sb.append(", storeId=").append(storeId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", status=").append(status);
+        sb.append(", opId=").append(opId);
+        sb.append(", opName=").append(opName);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,993 @@
+package com.hai.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class HighGroupOrderExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    private Integer limit;
+
+    private Long offset;
+
+    public HighGroupOrderExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setOffset(Long offset) {
+        this.offset = offset;
+    }
+
+    public Long getOffset() {
+        return offset;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNull() {
+            addCriterion("order_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNotNull() {
+            addCriterion("order_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoEqualTo(String value) {
+            addCriterion("order_no =", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotEqualTo(String value) {
+            addCriterion("order_no <>", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThan(String value) {
+            addCriterion("order_no >", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+            addCriterion("order_no >=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThan(String value) {
+            addCriterion("order_no <", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThanOrEqualTo(String value) {
+            addCriterion("order_no <=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLike(String value) {
+            addCriterion("order_no like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotLike(String value) {
+            addCriterion("order_no not like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIn(List<String> values) {
+            addCriterion("order_no in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotIn(List<String> values) {
+            addCriterion("order_no not in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoBetween(String value1, String value2) {
+            addCriterion("order_no between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotBetween(String value1, String value2) {
+            addCriterion("order_no not between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNull() {
+            addCriterion("group_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNotNull() {
+            addCriterion("group_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdEqualTo(Long value) {
+            addCriterion("group_id =", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotEqualTo(Long value) {
+            addCriterion("group_id <>", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThan(Long value) {
+            addCriterion("group_id >", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("group_id >=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThan(Long value) {
+            addCriterion("group_id <", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThanOrEqualTo(Long value) {
+            addCriterion("group_id <=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIn(List<Long> values) {
+            addCriterion("group_id in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotIn(List<Long> values) {
+            addCriterion("group_id not in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdBetween(Long value1, Long value2) {
+            addCriterion("group_id between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotBetween(Long value1, Long value2) {
+            addCriterion("group_id not between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdIsNull() {
+            addCriterion("store_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdIsNotNull() {
+            addCriterion("store_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdEqualTo(Long value) {
+            addCriterion("store_id =", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdNotEqualTo(Long value) {
+            addCriterion("store_id <>", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdGreaterThan(Long value) {
+            addCriterion("store_id >", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("store_id >=", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdLessThan(Long value) {
+            addCriterion("store_id <", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdLessThanOrEqualTo(Long value) {
+            addCriterion("store_id <=", value, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdIn(List<Long> values) {
+            addCriterion("store_id in", values, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdNotIn(List<Long> values) {
+            addCriterion("store_id not in", values, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdBetween(Long value1, Long value2) {
+            addCriterion("store_id between", value1, value2, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStoreIdNotBetween(Long value1, Long value2) {
+            addCriterion("store_id not between", value1, value2, "storeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIsNull() {
+            addCriterion("op_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIsNotNull() {
+            addCriterion("op_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdEqualTo(Long value) {
+            addCriterion("op_id =", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotEqualTo(Long value) {
+            addCriterion("op_id <>", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdGreaterThan(Long value) {
+            addCriterion("op_id >", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("op_id >=", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdLessThan(Long value) {
+            addCriterion("op_id <", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdLessThanOrEqualTo(Long value) {
+            addCriterion("op_id <=", value, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdIn(List<Long> values) {
+            addCriterion("op_id in", values, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotIn(List<Long> values) {
+            addCriterion("op_id not in", values, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdBetween(Long value1, Long value2) {
+            addCriterion("op_id between", value1, value2, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpIdNotBetween(Long value1, Long value2) {
+            addCriterion("op_id not between", value1, value2, "opId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIsNull() {
+            addCriterion("op_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIsNotNull() {
+            addCriterion("op_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameEqualTo(String value) {
+            addCriterion("op_name =", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotEqualTo(String value) {
+            addCriterion("op_name <>", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameGreaterThan(String value) {
+            addCriterion("op_name >", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameGreaterThanOrEqualTo(String value) {
+            addCriterion("op_name >=", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLessThan(String value) {
+            addCriterion("op_name <", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLessThanOrEqualTo(String value) {
+            addCriterion("op_name <=", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameLike(String value) {
+            addCriterion("op_name like", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotLike(String value) {
+            addCriterion("op_name not like", value, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameIn(List<String> values) {
+            addCriterion("op_name in", values, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotIn(List<String> values) {
+            addCriterion("op_name not in", values, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameBetween(String value1, String value2) {
+            addCriterion("op_name between", value1, value2, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpNameNotBetween(String value1, String value2) {
+            addCriterion("op_name not between", value1, value2, "opName");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1IsNull() {
+            addCriterion("ext_1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1IsNotNull() {
+            addCriterion("ext_1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1EqualTo(String value) {
+            addCriterion("ext_1 =", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotEqualTo(String value) {
+            addCriterion("ext_1 <>", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThan(String value) {
+            addCriterion("ext_1 >", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_1 >=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThan(String value) {
+            addCriterion("ext_1 <", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1LessThanOrEqualTo(String value) {
+            addCriterion("ext_1 <=", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Like(String value) {
+            addCriterion("ext_1 like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotLike(String value) {
+            addCriterion("ext_1 not like", value, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1In(List<String> values) {
+            addCriterion("ext_1 in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotIn(List<String> values) {
+            addCriterion("ext_1 not in", values, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1Between(String value1, String value2) {
+            addCriterion("ext_1 between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt1NotBetween(String value1, String value2) {
+            addCriterion("ext_1 not between", value1, value2, "ext1");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNull() {
+            addCriterion("ext_2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2IsNotNull() {
+            addCriterion("ext_2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2EqualTo(String value) {
+            addCriterion("ext_2 =", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotEqualTo(String value) {
+            addCriterion("ext_2 <>", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThan(String value) {
+            addCriterion("ext_2 >", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_2 >=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThan(String value) {
+            addCriterion("ext_2 <", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2LessThanOrEqualTo(String value) {
+            addCriterion("ext_2 <=", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Like(String value) {
+            addCriterion("ext_2 like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotLike(String value) {
+            addCriterion("ext_2 not like", value, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2In(List<String> values) {
+            addCriterion("ext_2 in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotIn(List<String> values) {
+            addCriterion("ext_2 not in", values, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2Between(String value1, String value2) {
+            addCriterion("ext_2 between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt2NotBetween(String value1, String value2) {
+            addCriterion("ext_2 not between", value1, value2, "ext2");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNull() {
+            addCriterion("ext_3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3IsNotNull() {
+            addCriterion("ext_3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3EqualTo(String value) {
+            addCriterion("ext_3 =", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotEqualTo(String value) {
+            addCriterion("ext_3 <>", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThan(String value) {
+            addCriterion("ext_3 >", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3GreaterThanOrEqualTo(String value) {
+            addCriterion("ext_3 >=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThan(String value) {
+            addCriterion("ext_3 <", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3LessThanOrEqualTo(String value) {
+            addCriterion("ext_3 <=", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Like(String value) {
+            addCriterion("ext_3 like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotLike(String value) {
+            addCriterion("ext_3 not like", value, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3In(List<String> values) {
+            addCriterion("ext_3 in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotIn(List<String> values) {
+            addCriterion("ext_3 not in", values, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3Between(String value1, String value2) {
+            addCriterion("ext_3 between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
+
+        public Criteria andExt3NotBetween(String value1, String value2) {
+            addCriterion("ext_3 not between", value1, value2, "ext3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

hai-service/src/main/java/com/hai/enum_type/ApiProductTypeEnum.java

@@ -16,9 +16,10 @@ public enum ApiProductTypeEnum {
     type4(4, "积分充值"),
     type5(5, "卡券"),
     type6(6, "在线加油"),
-    type7(7, "优惠券包 "),
-    type8(8, "汇联通充值 "),
-    type10(10, "实物商品 ")
+    type7(7, "优惠券包"),
+    type8(8, "汇联通充值"),
+    type10(10, "实物商品"),
+    type17(17, "团购套餐")
     ;
 
     private Integer type;

hai-service/src/main/java/com/hai/group/GroupCodeService.java

@@ -0,0 +1,108 @@
+package com.hai.group;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hai.entity.ApiIpAddress;
+import com.hai.entity.HighGroupCode;
+import com.hai.entity.HighGroupOrder;
+
+import java.util.List;
+import java.util.Map;
+
+public interface GroupCodeService {
+
+    /**
+    * @Author Sum1Dream
+    * @Name insertGroupCode
+    * @Description // 新增
+    * @Date 14:32 2023/11/10
+    * @Param highGroupCode
+     * @return void
+    */
+    void insertGroupCode(HighGroupCode highGroupCode);
+
+    /**
+    * @Author Sum1Dream
+    * @Name updateGroupCode
+    * @Description // 编辑
+    * @Date 14:32 2023/11/10
+    * @Param highGroupCode
+     * @return void
+    */
+    void updateGroupCode(HighGroupCode highGroupCode);
+
+    /**
+    * @Author Sum1Dream
+    * @Name findGroupCode
+    * @Description // 根据id查询
+    * @Date 14:32 2023/11/10
+    * @Param id
+     * @return com.hai.entity.HighGroupCode
+    */
+    HighGroupCode findGroupCode(Long id);
+
+    /**
+    * @Author Sum1Dream
+    * @Name findGroupCode
+    * @Description // 查询
+    * @Date 14:32 2023/11/10
+    * @Param map
+     * @return com.hai.entity.HighGroupCode
+    */
+    HighGroupCode findGroupCode(Map<String , Object> map);
+
+    /**
+    * @Author Sum1Dream
+    * @Name findGroupCodeList
+    * @Description // 查询列表
+    * @Date 14:32 2023/11/10
+    * @Param map
+     * @return java.util.List<com.hai.entity.HighGroupCode>
+    */
+    List<HighGroupCode> findGroupCodeList(Map<String , Object> map);
+
+    /**
+    * @Author Sum1Dream
+    * @Name generateCode
+    * @Description // 生成code
+    * @Date 14:41 2023/11/10
+    * @Param object
+     * @return void
+    */
+    HighGroupCode generateCode(Long userId , Long storeId , Long orderId , Long groupId);
+
+    /**
+    * @Author Sum1Dream
+    * @Name insertGroupOrder
+    * @Description // 新增团购订单
+    * @Date 14:54 2023/11/13
+    * @Param highGroupOrder
+     * @return void
+    */
+    void insertGroupOrder(HighGroupOrder highGroupOrder);
+
+    /**
+    * @Author Sum1Dream
+    * @Name updateGroupOrder
+    * @Description // 更新团购订单
+    * @Date 14:55 2023/11/13
+    * @Param highGroupOrder
+     * @return void
+    */
+    void updateGroupOrder(HighGroupOrder highGroupOrder);
+
+    /**
+    * @Author Sum1Dream
+    * @Name findGroupOrder
+    * @Description // 查询团购订单
+    * @Date 14:55 2023/11/13
+    * @Param groupId
+     * @return com.hai.entity.HighGroupOrder
+    */
+    HighGroupOrder findGroupOrder(Long groupId);
+
+    HighGroupOrder findGroupOrder(String orderNo);
+
+
+
+
+}

hai-service/src/main/java/com/hai/group/GroupService.java

@@ -21,6 +21,7 @@ public class GroupService {
     */
     public JSONObject getStoreList(JSONObject params) {
         return HttpsUtils.doPost(CommonSysConst.getSysConfig().getPayPostUrl() + "/openGroup/getStoreList" , params);
+//        return HttpsUtils.doPost("http://localhost:9601/crest/openGroup/getStoreList" , params);
     }
 
     /**
@@ -63,4 +64,9 @@ public class GroupService {
         return HttpsUtils.doPost(CommonSysConst.getSysConfig().getPayPostUrl() + "/openGroup/getBsStoreImgByList" , params);
     }
 
+
+
+
+
+
 }

hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java

@@ -0,0 +1,166 @@
+package com.hai.group.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hai.common.GenerateCode;
+import com.hai.common.QRCodeGenerator;
+import com.hai.common.utils.DateUtil;
+import com.hai.common.utils.IDGenerator;
+import com.hai.config.CommonSysConst;
+import com.hai.dao.HighGroupCodeMapper;
+import com.hai.dao.HighGroupOrderMapper;
+import com.hai.entity.HighGroupCode;
+import com.hai.entity.HighGroupCodeExample;
+import com.hai.entity.HighGroupOrder;
+import com.hai.entity.HighGroupOrderExample;
+import com.hai.group.GroupCodeService;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service("groupCodeService")
+public class GroupCodeServiceImpl implements GroupCodeService {
+
+    @Resource
+    private HighGroupCodeMapper highGroupCodeMapper;
+
+    @Resource
+    private HighGroupOrderMapper highGroupOrderMapper;
+
+    @Override
+    public void insertGroupCode(HighGroupCode highGroupCode) {
+        highGroupCodeMapper.insert(highGroupCode);
+    }
+
+    @Override
+    public void updateGroupCode(HighGroupCode highGroupCode) {
+        highGroupCodeMapper.updateByPrimaryKey(highGroupCode);
+    }
+
+    @Override
+    public HighGroupCode findGroupCode(Long id) {
+        return highGroupCodeMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public HighGroupCode findGroupCode(Map<String , Object> map) {
+        HighGroupCodeExample example = new HighGroupCodeExample();
+        HighGroupCodeExample.Criteria criteria = example.createCriteria();
+
+
+        if (MapUtils.getString(map, "groupCode") != null) {
+            criteria.andGroupCodeEqualTo(MapUtils.getString(map, "groupCode"));
+        }
+        if (MapUtils.getLong(map, "userId") != null) {
+            criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId"));
+        }
+        if (MapUtils.getLong(map, "storeId") != null) {
+            criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId"));
+        }
+
+
+        List<HighGroupCode> list = highGroupCodeMapper.selectByExample(example);
+
+        if (list.size() > 0) {
+            return list.get(0);
+        }
+
+        return null;
+    }
+
+    @Override
+    public List<HighGroupCode> findGroupCodeList(Map<String, Object> map) {
+        HighGroupCodeExample example = new HighGroupCodeExample();
+        HighGroupCodeExample.Criteria criteria = example.createCriteria();
+
+
+        if (MapUtils.getString(map, "groupCode") != null) {
+            criteria.andGroupCodeEqualTo(MapUtils.getString(map, "groupCode"));
+        }
+        if (MapUtils.getLong(map, "userId") != null) {
+            criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId"));
+        }
+        if (MapUtils.getLong(map, "storeId") != null) {
+            criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId"));
+        }
+
+        return highGroupCodeMapper.selectByExample(example);
+    }
+
+    @Override
+    public HighGroupCode generateCode(Long userId, Long storeId, Long orderId, Long groupId) {
+
+        try {
+
+            HighGroupCode highGroupCode = new HighGroupCode();
+
+            highGroupCode.setGroupId(groupId);
+            highGroupCode.setCreateTime(new Date());
+            highGroupCode.setOrderId(orderId);
+            highGroupCode.setSroreId(storeId);
+            highGroupCode.setUpdateTime(new Date());
+            highGroupCode.setUserId(userId);
+            highGroupCode.setStatus(1);
+            insertGroupCode(highGroupCode);
+            highGroupCode.setGroupCode(GenerateCode.convertCode(highGroupCode.getId() , 16));
+
+            // 生成二维码
+            String qrCodeImg = highGroupCode.getGroupCode() +".png";
+            String qrCodeUrl = CommonSysConst.getSysConfig().getFileUrl() + "/groupCode/" + qrCodeImg;
+            QRCodeGenerator.generateQRCodeImage(highGroupCode.getGroupCode(), 350, 350, qrCodeUrl);
+            highGroupCode.setCodeImgUrl(qrCodeUrl);
+
+            updateGroupCode(highGroupCode);
+
+            return highGroupCode;
+        } catch (Exception e) {
+            return null;
+        }
+
+    }
+
+    @Override
+    public void insertGroupOrder(HighGroupOrder highGroupOrder) {
+        highGroupOrderMapper.insert(highGroupOrder);
+    }
+
+    @Override
+    public void updateGroupOrder(HighGroupOrder highGroupOrder) {
+        highGroupOrderMapper.updateByPrimaryKey(highGroupOrder);
+    }
+
+    @Override
+    public HighGroupOrder findGroupOrder(Long groupId) {
+        HighGroupOrderExample example = new HighGroupOrderExample();
+        HighGroupOrderExample.Criteria criteria = example.createCriteria();
+
+        criteria.andGroupIdEqualTo(groupId);
+
+        List<HighGroupOrder> list = highGroupOrderMapper.selectByExample(example);
+
+        if (!list.isEmpty()) {
+            return list.get(0);
+        }
+
+        return null;
+    }
+
+    @Override
+    public HighGroupOrder findGroupOrder(String orderNo) {
+        HighGroupOrderExample example = new HighGroupOrderExample();
+        HighGroupOrderExample.Criteria criteria = example.createCriteria();
+
+        criteria.andOrderNoEqualTo(orderNo);
+
+        List<HighGroupOrder> list = highGroupOrderMapper.selectByExample(example);
+
+        if (!list.isEmpty()) {
+            return list.get(0);
+        }
+
+        return null;
+    }
+}

hai-service/src/main/java/com/hai/order/model/CreateOrderChildModel.java

@@ -154,4 +154,9 @@ public class CreateOrderChildModel {
     // 车牌号
     private String carNo;
     /** ======================= 比邻星停车核销 end ======================== **/
+
+    /** ======================= 实物商品所需参数 start ======================== **/
+    // 团购id
+    private Long groupId;
+    /** ======================= 实物商品所需参数 end ======================== **/
 }

hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java

@@ -126,4 +126,15 @@ public interface OrderCreateHandleService {
      * @return
      */
     HighChildOrder oilCard(HighOrder order , CreateOrderChildModel createOrderChildModel);
+    /**
+    * @Author Sum1Dream
+    * @Name group
+    * @Description // 购买团购产品
+    * @Date 13:58 2023/11/13
+    * @Param order
+     * @Param createOrderChildModel
+     * @return com.hai.entity.HighChildOrder
+    */
+    HighChildOrder group(HighOrder order , CreateOrderChildModel createOrderChildModel) throws  Exception;
+
 }

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

@@ -15,6 +15,8 @@ import com.hai.goods.service.GoodsDetailService;
 import com.hai.goods.service.GoodsPresentService;
 import com.hai.goods.service.GoodsSkuService;
 import com.hai.goods.service.ShoppingCartService;
+import com.hai.group.GroupCodeService;
+import com.hai.group.GroupService;
 import com.hai.model.GasPayPriceModel;
 import com.hai.model.OutRechargePriceModel;
 import com.hai.openApi.config.BlxConfig;
@@ -91,6 +93,9 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
     @Resource
     private HighDiscountCouponRelService discountCouponRelService;
 
+    @Resource
+    private GroupService groupService;
+
     @Resource
     private OutRechargeOrderMapper outRechargeOrderMapper;
 
@@ -153,6 +158,9 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
     @Resource
     private HighOilCardOrderService highOilCardOrderService;
 
+    @Resource
+    private GroupCodeService groupCodeService;
+
     @Resource
     private HighOilCardService oilCardService;
 
@@ -1141,6 +1149,52 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
         return childOrder;
     }
 
+
+    @Override
+    public HighChildOrder group(HighOrder order, CreateOrderChildModel createOrderChildModel) throws Exception {
+        HighChildOrder childOrder = new HighChildOrder();
+        JSONObject object = groupService.getGroupContent(createOrderChildModel.getGroupId());
+
+        if (object.getString("return_code").equals("000000")) {
+            JSONObject data = object.getJSONObject("return_data");
+            childOrder.setGoodsPrice(data.getBigDecimal("originalPrice"));
+            childOrder.setGoodsActualPrice(data.getBigDecimal("price"));
+            childOrder.setGoodsName(data.getString("name"));
+        } else {
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object.getString("return_msg"));
+        }
+
+
+        HighGroupOrder highGroupOrder = new HighGroupOrder();
+        highGroupOrder.setGroupId(createOrderChildModel.getGroupId());
+        highGroupOrder.setStoreId(createOrderChildModel.getStoreId());
+        highGroupOrder.setOrderNo(order.getOrderNo());
+        highGroupOrder.setCreateTime(new Date());
+        highGroupOrder.setUpdateTime(new Date());
+        highGroupOrder.setStatus(OrderChildStatus.STATUS1.getNumber());
+
+        groupCodeService.insertGroupOrder(highGroupOrder);
+
+        childOrder.setOrderNo(order.getOrderNo());
+        childOrder.setMemId(order.getMemId());
+        childOrder.setMemName(order.getMemName());
+        childOrder.setMemPhone(order.getMemPhone());
+        childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
+        childOrder.setGoodsType(OrderChildGoodsType.TYPE17.getNumber());
+        childOrder.setGoodsId(order.getMemId());
+        childOrder.setGoodsSpecName("份");
+        childOrder.setSaleCount(createOrderChildModel.getSaleCount());
+        childOrder.setGiveawayType(false);
+        childOrder.setChildOrderStatus(OrderChildStatus.STATUS1.getNumber());
+        childOrder.setTotalPrice(childOrder.getGoodsPrice().multiply(new BigDecimal(childOrder.getSaleCount())));
+        childOrder.setTotalActualPrice(childOrder.getGoodsActualPrice().multiply(new BigDecimal(childOrder.getSaleCount())));
+        childOrder.setTotalDeductionPrice(childOrder.getTotalPrice().subtract(childOrder.getTotalActualPrice()));
+        childOrder.setPraiseStatus(0);
+        childOrder.setCreateTime(new Date());
+
+        return childOrder;
+    }
+
     @Override
     public HighChildOrder oilCard(HighOrder order, CreateOrderChildModel createOrderChildModel) {
         // 查询油卡

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

@@ -11,6 +11,7 @@ import com.hai.entity.*;
 import com.hai.enum_type.*;
 import com.hai.goods.service.GoodsOrderExtService;
 import com.hai.goods.service.GoodsPresentService;
+import com.hai.group.GroupCodeService;
 import com.hai.msg.entity.MsgTopic;
 import com.hai.openApi.config.BlxConfig;
 import com.hai.openApi.service.ApiBlxCouponService;
@@ -125,6 +126,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
     @Resource
     private HighOilCardOrderService highOilCardOrderService;
 
+    @Resource
+    private GroupCodeService groupCodeService;
+
 
     @Override
     public HighOrder orderPaySuccessHandle(String orderNo, OrderPayType payType, String paySerialNo, BigDecimal payRealPrice, HighUserCard userCard) {
@@ -248,6 +252,8 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
                 blxOrderHandle(order);
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE14.getNumber())) {
                 levelUp(order);
+            } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) {
+                group(order);
             } else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE15.getNumber())) {
                 oilCardHandle(childOrder.getGoodsSpecName(), order);
             }
@@ -644,4 +650,25 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
         }
 
     }
+
+    private void group(HighOrder order) {
+
+        HighGroupOrder highGroupOrder = groupCodeService.findGroupOrder(order.getOrderNo());
+
+        groupCodeService.generateCode(order.getMemId() , highGroupOrder.getStoreId()  , order.getId() , highGroupOrder.getGroupId());
+
+        highGroupOrder.setStatus(OrderStatus.STATUS2.getNumber());
+        highGroupOrder.setUpdateTime(new Date());
+
+        groupCodeService.updateGroupOrder(highGroupOrder);
+
+
+        order.setOrderStatus(OrderStatus.STATUS2.getNumber());
+        order.setFinishTime(new Date());
+        for (HighChildOrder childOrder : order.getHighChildOrderList()) {
+            childOrder.setChildOrderStatus(OrderChildStatus.STATUS2.getNumber());
+        }
+
+    }
+
 }

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

@@ -369,6 +369,12 @@ public class OrderServiceImpl implements OrderService {
                 childOrderList.add(childOrder);
                 order.setProductType(OrderProductType.PRODUCT_TYPE16.getNumber());
                 order.setTitle("油卡充值");
+            } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) {
+                HighChildOrder childOrder = orderCreateHandleService.group(order , child);
+                childOrderList.add(childOrder);
+                order.setProductType(OrderProductType.PRODUCT_TYPE17.getNumber());
+                order.setSecUserId(childOrder.getId());
+                order.setTitle("团购套餐");
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知业务类型");
             }

hai-service/src/main/java/com/hai/order/type/OrderChildGoodsType.java

@@ -24,7 +24,7 @@ public enum OrderChildGoodsType {
     TYPE13(13, "比邻星停车"),
     TYPE14(14, "升级会员"),
     TYPE15(15, "个人油卡充值"),
-
+    TYPE17(17, "团购套餐"),
             ;
 
     private Integer number;

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

@@ -218,7 +218,7 @@ public class HighUserServiceImpl implements HighUserService {
         user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(userId));
         user.setIsSetHltCard(highUserCardService.isBindHtlCard(userId));
         user.setHltCardNo(highUserCardService.getUserHtlCardNo(userId));
-        user.setBlxCouponBalance(highUserCardService.getBlxCouponBalance(user.getPhone()).getInteger("num"));
+//        user.setBlxCouponBalance(highUserCardService.getBlxCouponBalance(user.getPhone()).getInteger("num"));
 
         // 查询油卡
         List<HighUserCard> oilCardList = highUserCardService.getListByUser(userId, UserCardType.type2.getType());
@@ -422,7 +422,6 @@ public class HighUserServiceImpl implements HighUserService {
 
         JSONObject object = new JSONObject();
 
-
         return null;
     }