合并代码

hai-bweb/src/main/java/com/bweb/controller/HighMerchantTripartitePlatformController.java

@@ -0,0 +1,88 @@
+package com.bweb.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hai.common.exception.ErrorCode;
+import com.hai.common.exception.ErrorHelp;
+import com.hai.common.exception.SysCode;
+import com.hai.common.utils.ResponseMsgUtil;
+import com.hai.entity.HighMerchantTripartitePlatform;
+import com.hai.model.ResponseData;
+import com.hai.service.HighMerchantTripartitePlatformService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping(value = "/merchantTripartitePlatform")
+@Api(value = "商户第三方平台")
+public class HighMerchantTripartitePlatformController {
+
+    private static Logger log = LoggerFactory.getLogger(HighMerchantTripartitePlatformController.class);
+
+    @Resource
+    private HighMerchantTripartitePlatformService tripartitePlatformService;
+
+    @RequestMapping(value="/editTripartitePlatform",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "编辑第三方平台")
+    public ResponseData editTripartitePlatform(@RequestBody JSONObject body) {
+        try {
+            if (body == null
+                    || body.getLong("merId") == null
+                    || body.getInteger("platformType") == null
+                    || StringUtils.isBlank(body.getString("platformMerName"))
+                    || StringUtils.isBlank(body.getString("platformMerNumber"))
+                    || body.getBoolean("profitSharingStatus") == null
+            ) {
+                log.error("HighMerchantController -> insertMerchantStore() error!","");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+
+            if (body.getBoolean("profitSharingStatus") == true && body.getBigDecimal("profitSharingRatio") == null) {
+                log.error("HighMerchantController -> insertMerchantStore() error!","");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+            HighMerchantTripartitePlatform platform = tripartitePlatformService.getDetail(body.getLong("merId"), body.getInteger("platformType"));
+            if (platform == null) {
+                platform = new HighMerchantTripartitePlatform();
+
+            }
+            platform.setMerId(body.getLong("merId"));
+            platform.setPlatformType(body.getInteger("platformType"));
+            platform.setPlatformMerName(body.getString("platformMerName"));
+            platform.setPlatformMerNumber(body.getString("platformMerNumber"));
+            platform.setProfitSharingStatus(body.getBoolean("profitSharingStatus"));
+            platform.setProfitSharingRatio(body.getBigDecimal("profitSharingRatio"));
+            tripartitePlatformService.editDate(platform);
+
+            return ResponseMsgUtil.success("操作成功");
+
+        } catch (Exception e) {
+            log.error("HighMerchantTripartitePlatformController -> editTripartitePlatform() error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
+    @RequestMapping(value="/getDetail",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "查询详情")
+    public ResponseData getDetail(@RequestParam(value = "merId" , required = true) Long merId,
+                                  @RequestParam(value = "platformType" , required = true) Integer platformType,
+                                  HttpServletRequest request) {
+        try {
+
+            return ResponseMsgUtil.success(tripartitePlatformService.getDetail(merId, platformType));
+
+        } catch (Exception e) {
+            log.error("HighMerchantTripartitePlatformController -> getDetail() error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+}

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -87,6 +87,9 @@ public class OrderController {
     @Resource
     private HighMerchantStoreService merchantStoreService;
 
+    @Resource
+    private HighMerchantTripartitePlatformService tripartitePlatformService;
+
     @Resource
     private HighQzOrderService highQzOrderService;
 
@@ -211,6 +214,25 @@ public class OrderController {
             } else if (order.getHighChildOrderList().get(0).getGoodsType() == 3) {
                 weChatPayReqInfo.setSub_mch_id("1624126902");  // 浩联商户号
                 profitSharing = "Y";
+
+                // 查询油站
+                HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(order.getHighChildOrderList().get(0).getGoodsId());
+                if (store != null && store.getSourceType().equals(1)) {
+                    // 预存类型  0：非预存  1：预存门店
+                    if (store.getPrestoreType().equals(0)) {
+                        profitSharing = "N";
+
+                        // 第三方平台
+                        HighMerchantTripartitePlatform merTripartitePlatform = tripartitePlatformService.getDetail(store.getId(), 1);
+                        if (merTripartitePlatform != null) {
+                            weChatPayReqInfo.setSub_mch_id(merTripartitePlatform.getPlatformMerNumber());
+                            profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N";
+                        }
+                    }
+                    if (store.getPrestoreType().equals(1)) {
+                        profitSharing = "N";
+                    }
+                }
             } else {
                 //子商户号
                 weChatPayReqInfo.setSub_mch_id(SysConst.getSysConfig().getWxSubMchId());
@@ -236,6 +258,8 @@ public class OrderController {
             payMap.put("unified_order_url",SysConst.getSysConfig().getWxUnifiedOrderUrl());
             SortedMap<Object, Object> sortedMap = wechatPayUtil.goWechatPay(weChatPayReqInfo,payMap);
 
+            order.setProfitSharingStatus(profitSharing.equals("y")?true:false);
+            order.setAccountMerchantNum(weChatPayReqInfo.getSub_mch_id());
             order.setExt1(weChatPayReqInfo.getSub_appid());
             highOrderService.updateOrderDetail(order);
             return ResponseMsgUtil.success(sortedMap);

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

@@ -0,0 +1,130 @@
+package com.hai.dao;
+
+import com.hai.entity.HighMerchantTripartitePlatform;
+import com.hai.entity.HighMerchantTripartitePlatformExample;
+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 HighMerchantTripartitePlatformMapper extends HighMerchantTripartitePlatformMapperExt {
+    @SelectProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="countByExample")
+    long countByExample(HighMerchantTripartitePlatformExample example);
+
+    @DeleteProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="deleteByExample")
+    int deleteByExample(HighMerchantTripartitePlatformExample example);
+
+    @Delete({
+        "delete from high_merchant_tripartite_platform",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into high_merchant_tripartite_platform (mer_id, platform_type, ",
+        "platform_mer_name, platform_mer_number, ",
+        "profit_sharing_status, profit_sharing_ratio, ",
+        "`status`, create_time, ",
+        "update_time, ext_1, ",
+        "ext_2, ext_3)",
+        "values (#{merId,jdbcType=BIGINT}, #{platformType,jdbcType=INTEGER}, ",
+        "#{platformMerName,jdbcType=VARCHAR}, #{platformMerNumber,jdbcType=VARCHAR}, ",
+        "#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ",
+        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(HighMerchantTripartitePlatform record);
+
+    @InsertProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(HighMerchantTripartitePlatform record);
+
+    @SelectProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER),
+        @Result(column="platform_mer_name", property="platformMerName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
+        @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
+        @Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @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<HighMerchantTripartitePlatform> selectByExample(HighMerchantTripartitePlatformExample example);
+
+    @Select({
+        "select",
+        "id, mer_id, platform_type, platform_mer_name, platform_mer_number, profit_sharing_status, ",
+        "profit_sharing_ratio, `status`, create_time, update_time, ext_1, ext_2, ext_3",
+        "from high_merchant_tripartite_platform",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT),
+        @Result(column="platform_type", property="platformType", jdbcType=JdbcType.INTEGER),
+        @Result(column="platform_mer_name", property="platformMerName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
+        @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
+        @Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @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)
+    })
+    HighMerchantTripartitePlatform selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") HighMerchantTripartitePlatform record, @Param("example") HighMerchantTripartitePlatformExample example);
+
+    @UpdateProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") HighMerchantTripartitePlatform record, @Param("example") HighMerchantTripartitePlatformExample example);
+
+    @UpdateProvider(type=HighMerchantTripartitePlatformSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(HighMerchantTripartitePlatform record);
+
+    @Update({
+        "update high_merchant_tripartite_platform",
+        "set mer_id = #{merId,jdbcType=BIGINT},",
+          "platform_type = #{platformType,jdbcType=INTEGER},",
+          "platform_mer_name = #{platformMerName,jdbcType=VARCHAR},",
+          "platform_mer_number = #{platformMerNumber,jdbcType=VARCHAR},",
+          "profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},",
+          "profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(HighMerchantTripartitePlatform record);
+}

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

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

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

@@ -0,0 +1,346 @@
+package com.hai.dao;
+
+import com.hai.entity.HighMerchantTripartitePlatform;
+import com.hai.entity.HighMerchantTripartitePlatformExample.Criteria;
+import com.hai.entity.HighMerchantTripartitePlatformExample.Criterion;
+import com.hai.entity.HighMerchantTripartitePlatformExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class HighMerchantTripartitePlatformSqlProvider {
+
+    public String countByExample(HighMerchantTripartitePlatformExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("high_merchant_tripartite_platform");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(HighMerchantTripartitePlatformExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("high_merchant_tripartite_platform");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(HighMerchantTripartitePlatform record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("high_merchant_tripartite_platform");
+        
+        if (record.getMerId() != null) {
+            sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getPlatformType() != null) {
+            sql.VALUES("platform_type", "#{platformType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPlatformMerName() != null) {
+            sql.VALUES("platform_mer_name", "#{platformMerName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPlatformMerNumber() != null) {
+            sql.VALUES("platform_mer_number", "#{platformMerNumber,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getProfitSharingStatus() != null) {
+            sql.VALUES("profit_sharing_status", "#{profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getProfitSharingRatio() != null) {
+            sql.VALUES("profit_sharing_ratio", "#{profitSharingRatio,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        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(HighMerchantTripartitePlatformExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("mer_id");
+        sql.SELECT("platform_type");
+        sql.SELECT("platform_mer_name");
+        sql.SELECT("platform_mer_number");
+        sql.SELECT("profit_sharing_status");
+        sql.SELECT("profit_sharing_ratio");
+        sql.SELECT("`status`");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("high_merchant_tripartite_platform");
+        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) {
+        HighMerchantTripartitePlatform record = (HighMerchantTripartitePlatform) parameter.get("record");
+        HighMerchantTripartitePlatformExample example = (HighMerchantTripartitePlatformExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("high_merchant_tripartite_platform");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getMerId() != null) {
+            sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getPlatformType() != null) {
+            sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPlatformMerName() != null) {
+            sql.SET("platform_mer_name = #{record.platformMerName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPlatformMerNumber() != null) {
+            sql.SET("platform_mer_number = #{record.platformMerNumber,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getProfitSharingStatus() != null) {
+            sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getProfitSharingRatio() != null) {
+            sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        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.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_merchant_tripartite_platform");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}");
+        sql.SET("platform_type = #{record.platformType,jdbcType=INTEGER}");
+        sql.SET("platform_mer_name = #{record.platformMerName,jdbcType=VARCHAR}");
+        sql.SET("platform_mer_number = #{record.platformMerNumber,jdbcType=VARCHAR}");
+        sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
+        sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        HighMerchantTripartitePlatformExample example = (HighMerchantTripartitePlatformExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(HighMerchantTripartitePlatform record) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_merchant_tripartite_platform");
+        
+        if (record.getMerId() != null) {
+            sql.SET("mer_id = #{merId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getPlatformType() != null) {
+            sql.SET("platform_type = #{platformType,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPlatformMerName() != null) {
+            sql.SET("platform_mer_name = #{platformMerName,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getPlatformMerNumber() != null) {
+            sql.SET("platform_mer_number = #{platformMerNumber,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getProfitSharingStatus() != null) {
+            sql.SET("profit_sharing_status = #{profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getProfitSharingRatio() != null) {
+            sql.SET("profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        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, HighMerchantTripartitePlatformExample 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/HighOrderMapper.java

@@ -53,7 +53,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
         "finish_time, remarks, ",
         "refund_time, refund_price, ",
         "refund_content, refusal_refund_content, ",
-        "Identification_code, ext_1, ",
+        "Identification_code, profit_sharing_status, ",
+        "account_merchant_num, ext_1, ",
         "ext_2, ext_3)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ",
         "#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ",
@@ -69,7 +70,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
         "#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ",
         "#{refundTime,jdbcType=TIMESTAMP}, #{refundPrice,jdbcType=DECIMAL}, ",
         "#{refundContent,jdbcType=VARCHAR}, #{refusalRefundContent,jdbcType=VARCHAR}, ",
-        "#{identificationCode,jdbcType=BIGINT}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{identificationCode,jdbcType=BIGINT}, #{profitSharingStatus,jdbcType=BIT}, ",
+        "#{accountMerchantNum,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
         "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
@@ -111,6 +113,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
         @Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
         @Result(column="refusal_refund_content", property="refusalRefundContent", jdbcType=JdbcType.VARCHAR),
         @Result(column="Identification_code", property="identificationCode", jdbcType=JdbcType.BIGINT),
+        @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
+        @Result(column="account_merchant_num", property="accountMerchantNum", 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)
@@ -123,7 +127,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
         "mem_card_id, mem_card_type, mem_card_no, pay_model, pay_type, pay_gold, pay_price, ",
         "pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ",
         "pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_time, refund_price, ",
-        "refund_content, refusal_refund_content, Identification_code, ext_1, ext_2, ext_3",
+        "refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ",
+        "account_merchant_num, ext_1, ext_2, ext_3",
         "from high_order",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -158,6 +163,8 @@ public interface HighOrderMapper extends HighOrderMapperExt {
         @Result(column="refund_content", property="refundContent", jdbcType=JdbcType.VARCHAR),
         @Result(column="refusal_refund_content", property="refusalRefundContent", jdbcType=JdbcType.VARCHAR),
         @Result(column="Identification_code", property="identificationCode", jdbcType=JdbcType.BIGINT),
+        @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
+        @Result(column="account_merchant_num", property="accountMerchantNum", 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)
@@ -204,12 +211,12 @@ public interface HighOrderMapper extends HighOrderMapperExt {
           "refund_content = #{refundContent,jdbcType=VARCHAR},",
           "refusal_refund_content = #{refusalRefundContent,jdbcType=VARCHAR},",
           "Identification_code = #{identificationCode,jdbcType=BIGINT},",
+          "profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},",
+          "account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",
           "ext_2 = #{ext2,jdbcType=VARCHAR},",
           "ext_3 = #{ext3,jdbcType=VARCHAR}",
         "where id = #{id,jdbcType=BIGINT}"
     })
     int updateByPrimaryKey(HighOrder record);
-
-
-}
+}

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

@@ -0,0 +1,130 @@
+package com.hai.dao;
+
+import com.hai.entity.HighOrderSplitAccountsRecord;
+import com.hai.entity.HighOrderSplitAccountsRecordExample;
+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 HighOrderSplitAccountsRecordMapper extends HighOrderSplitAccountsRecordMapperExt {
+    @SelectProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="countByExample")
+    long countByExample(HighOrderSplitAccountsRecordExample example);
+
+    @DeleteProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="deleteByExample")
+    int deleteByExample(HighOrderSplitAccountsRecordExample example);
+
+    @Delete({
+        "delete from high_order_split_accounts_record",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into high_order_split_accounts_record (order_id, order_no, ",
+        "`type`, account_no, ",
+        "rate, split_price, ",
+        "`status`, create_time, ",
+        "update_time, ext_1, ",
+        "ext_2, ext_3)",
+        "values (#{orderId,jdbcType=BIGINT}, #{orderNo,jdbcType=INTEGER}, ",
+        "#{type,jdbcType=INTEGER}, #{accountNo,jdbcType=VARCHAR}, ",
+        "#{rate,jdbcType=DECIMAL}, #{splitPrice,jdbcType=DECIMAL}, ",
+        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(HighOrderSplitAccountsRecord record);
+
+    @InsertProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(HighOrderSplitAccountsRecord record);
+
+    @SelectProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.INTEGER),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="account_no", property="accountNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="rate", property="rate", jdbcType=JdbcType.DECIMAL),
+        @Result(column="split_price", property="splitPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @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<HighOrderSplitAccountsRecord> selectByExample(HighOrderSplitAccountsRecordExample example);
+
+    @Select({
+        "select",
+        "id, order_id, order_no, `type`, account_no, rate, split_price, `status`, create_time, ",
+        "update_time, ext_1, ext_2, ext_3",
+        "from high_order_split_accounts_record",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
+        @Result(column="order_no", property="orderNo", jdbcType=JdbcType.INTEGER),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="account_no", property="accountNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="rate", property="rate", jdbcType=JdbcType.DECIMAL),
+        @Result(column="split_price", property="splitPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
+        @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)
+    })
+    HighOrderSplitAccountsRecord selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") HighOrderSplitAccountsRecord record, @Param("example") HighOrderSplitAccountsRecordExample example);
+
+    @UpdateProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") HighOrderSplitAccountsRecord record, @Param("example") HighOrderSplitAccountsRecordExample example);
+
+    @UpdateProvider(type=HighOrderSplitAccountsRecordSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(HighOrderSplitAccountsRecord record);
+
+    @Update({
+        "update high_order_split_accounts_record",
+        "set order_id = #{orderId,jdbcType=BIGINT},",
+          "order_no = #{orderNo,jdbcType=INTEGER},",
+          "`type` = #{type,jdbcType=INTEGER},",
+          "account_no = #{accountNo,jdbcType=VARCHAR},",
+          "rate = #{rate,jdbcType=DECIMAL},",
+          "split_price = #{splitPrice,jdbcType=DECIMAL},",
+          "`status` = #{status,jdbcType=INTEGER},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP},",
+          "update_time = #{updateTime,jdbcType=TIMESTAMP},",
+          "ext_1 = #{ext1,jdbcType=VARCHAR},",
+          "ext_2 = #{ext2,jdbcType=VARCHAR},",
+          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(HighOrderSplitAccountsRecord record);
+}

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

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

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

@@ -0,0 +1,346 @@
+package com.hai.dao;
+
+import com.hai.entity.HighOrderSplitAccountsRecord;
+import com.hai.entity.HighOrderSplitAccountsRecordExample.Criteria;
+import com.hai.entity.HighOrderSplitAccountsRecordExample.Criterion;
+import com.hai.entity.HighOrderSplitAccountsRecordExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class HighOrderSplitAccountsRecordSqlProvider {
+
+    public String countByExample(HighOrderSplitAccountsRecordExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("high_order_split_accounts_record");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(HighOrderSplitAccountsRecordExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("high_order_split_accounts_record");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(HighOrderSplitAccountsRecord record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("high_order_split_accounts_record");
+        
+        if (record.getOrderId() != null) {
+            sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.VALUES("order_no", "#{orderNo,jdbcType=INTEGER}");
+        }
+        
+        if (record.getType() != null) {
+            sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAccountNo() != null) {
+            sql.VALUES("account_no", "#{accountNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getRate() != null) {
+            sql.VALUES("rate", "#{rate,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSplitPrice() != null) {
+            sql.VALUES("split_price", "#{splitPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        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(HighOrderSplitAccountsRecordExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("order_id");
+        sql.SELECT("order_no");
+        sql.SELECT("`type`");
+        sql.SELECT("account_no");
+        sql.SELECT("rate");
+        sql.SELECT("split_price");
+        sql.SELECT("`status`");
+        sql.SELECT("create_time");
+        sql.SELECT("update_time");
+        sql.SELECT("ext_1");
+        sql.SELECT("ext_2");
+        sql.SELECT("ext_3");
+        sql.FROM("high_order_split_accounts_record");
+        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) {
+        HighOrderSplitAccountsRecord record = (HighOrderSplitAccountsRecord) parameter.get("record");
+        HighOrderSplitAccountsRecordExample example = (HighOrderSplitAccountsRecordExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("high_order_split_accounts_record");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderId() != null) {
+            sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{record.orderNo,jdbcType=INTEGER}");
+        }
+        
+        if (record.getType() != null) {
+            sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAccountNo() != null) {
+            sql.SET("account_no = #{record.accountNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getRate() != null) {
+            sql.SET("rate = #{record.rate,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSplitPrice() != null) {
+            sql.SET("split_price = #{record.splitPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
+        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.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_order_split_accounts_record");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
+        sql.SET("order_no = #{record.orderNo,jdbcType=INTEGER}");
+        sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        sql.SET("account_no = #{record.accountNo,jdbcType=VARCHAR}");
+        sql.SET("rate = #{record.rate,jdbcType=DECIMAL}");
+        sql.SET("split_price = #{record.splitPrice,jdbcType=DECIMAL}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
+        sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
+        sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
+        sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        
+        HighOrderSplitAccountsRecordExample example = (HighOrderSplitAccountsRecordExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(HighOrderSplitAccountsRecord record) {
+        SQL sql = new SQL();
+        sql.UPDATE("high_order_split_accounts_record");
+        
+        if (record.getOrderId() != null) {
+            sql.SET("order_id = #{orderId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOrderNo() != null) {
+            sql.SET("order_no = #{orderNo,jdbcType=INTEGER}");
+        }
+        
+        if (record.getType() != null) {
+            sql.SET("`type` = #{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getAccountNo() != null) {
+            sql.SET("account_no = #{accountNo,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getRate() != null) {
+            sql.SET("rate = #{rate,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSplitPrice() != null) {
+            sql.SET("split_price = #{splitPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getUpdateTime() != null) {
+            sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
+        }
+        
+        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, HighOrderSplitAccountsRecordExample 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/HighOrderSqlProvider.java

@@ -144,6 +144,14 @@ public class HighOrderSqlProvider {
             sql.VALUES("Identification_code", "#{identificationCode,jdbcType=BIGINT}");
         }
         
+        if (record.getProfitSharingStatus() != null) {
+            sql.VALUES("profit_sharing_status", "#{profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getAccountMerchantNum() != null) {
+            sql.VALUES("account_merchant_num", "#{accountMerchantNum,jdbcType=VARCHAR}");
+        }
+        
         if (record.getExt1() != null) {
             sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
         }
@@ -195,6 +203,8 @@ public class HighOrderSqlProvider {
         sql.SELECT("refund_content");
         sql.SELECT("refusal_refund_content");
         sql.SELECT("Identification_code");
+        sql.SELECT("profit_sharing_status");
+        sql.SELECT("account_merchant_num");
         sql.SELECT("ext_1");
         sql.SELECT("ext_2");
         sql.SELECT("ext_3");
@@ -335,6 +345,14 @@ public class HighOrderSqlProvider {
             sql.SET("Identification_code = #{record.identificationCode,jdbcType=BIGINT}");
         }
         
+        if (record.getProfitSharingStatus() != null) {
+            sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getAccountMerchantNum() != null) {
+            sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}");
+        }
+        
         if (record.getExt1() != null) {
             sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
         }
@@ -385,6 +403,8 @@ public class HighOrderSqlProvider {
         sql.SET("refund_content = #{record.refundContent,jdbcType=VARCHAR}");
         sql.SET("refusal_refund_content = #{record.refusalRefundContent,jdbcType=VARCHAR}");
         sql.SET("Identification_code = #{record.identificationCode,jdbcType=BIGINT}");
+        sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
+        sql.SET("account_merchant_num = #{record.accountMerchantNum,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}");
@@ -514,6 +534,14 @@ public class HighOrderSqlProvider {
             sql.SET("Identification_code = #{identificationCode,jdbcType=BIGINT}");
         }
         
+        if (record.getProfitSharingStatus() != null) {
+            sql.SET("profit_sharing_status = #{profitSharingStatus,jdbcType=BIT}");
+        }
+        
+        if (record.getAccountMerchantNum() != null) {
+            sql.SET("account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR}");
+        }
+        
         if (record.getExt1() != null) {
             sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
         }

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

@@ -0,0 +1,246 @@
+package com.hai.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * high_merchant_tripartite_platform
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class HighMerchantTripartitePlatform implements Serializable {
+    private Long id;
+
+    /**
+     * 商户id
+     */
+    private Long merId;
+
+    /**
+     * 平台类型  1：微信
+     */
+    private Integer platformType;
+
+    /**
+     * 商户名称
+     */
+    private String platformMerName;
+
+    /**
+     * 商户号
+     */
+    private String platformMerNumber;
+
+    /**
+     * 是否分账
+     */
+    private Boolean profitSharingStatus;
+
+    /**
+     * 分账比率
+     */
+    private BigDecimal profitSharingRatio;
+
+    /**
+     * 状态  0：删除  1：正常
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getMerId() {
+        return merId;
+    }
+
+    public void setMerId(Long merId) {
+        this.merId = merId;
+    }
+
+    public Integer getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+
+    public String getPlatformMerName() {
+        return platformMerName;
+    }
+
+    public void setPlatformMerName(String platformMerName) {
+        this.platformMerName = platformMerName;
+    }
+
+    public String getPlatformMerNumber() {
+        return platformMerNumber;
+    }
+
+    public void setPlatformMerNumber(String platformMerNumber) {
+        this.platformMerNumber = platformMerNumber;
+    }
+
+    public Boolean getProfitSharingStatus() {
+        return profitSharingStatus;
+    }
+
+    public void setProfitSharingStatus(Boolean profitSharingStatus) {
+        this.profitSharingStatus = profitSharingStatus;
+    }
+
+    public BigDecimal getProfitSharingRatio() {
+        return profitSharingRatio;
+    }
+
+    public void setProfitSharingRatio(BigDecimal profitSharingRatio) {
+        this.profitSharingRatio = profitSharingRatio;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    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 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;
+        }
+        HighMerchantTripartitePlatform other = (HighMerchantTripartitePlatform) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId()))
+            && (this.getPlatformType() == null ? other.getPlatformType() == null : this.getPlatformType().equals(other.getPlatformType()))
+            && (this.getPlatformMerName() == null ? other.getPlatformMerName() == null : this.getPlatformMerName().equals(other.getPlatformMerName()))
+            && (this.getPlatformMerNumber() == null ? other.getPlatformMerNumber() == null : this.getPlatformMerNumber().equals(other.getPlatformMerNumber()))
+            && (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus()))
+            && (this.getProfitSharingRatio() == null ? other.getProfitSharingRatio() == null : this.getProfitSharingRatio().equals(other.getProfitSharingRatio()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (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 + ((getMerId() == null) ? 0 : getMerId().hashCode());
+        result = prime * result + ((getPlatformType() == null) ? 0 : getPlatformType().hashCode());
+        result = prime * result + ((getPlatformMerName() == null) ? 0 : getPlatformMerName().hashCode());
+        result = prime * result + ((getPlatformMerNumber() == null) ? 0 : getPlatformMerNumber().hashCode());
+        result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode());
+        result = prime * result + ((getProfitSharingRatio() == null) ? 0 : getProfitSharingRatio().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().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(", merId=").append(merId);
+        sb.append(", platformType=").append(platformType);
+        sb.append(", platformMerName=").append(platformMerName);
+        sb.append(", platformMerNumber=").append(platformMerNumber);
+        sb.append(", profitSharingStatus=").append(profitSharingStatus);
+        sb.append(", profitSharingRatio=").append(profitSharingRatio);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        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/HighOrder.java

@@ -71,7 +71,7 @@ public class HighOrder implements Serializable {
     private Integer payModel;
 
     /**
-     * 支付方式： 1：支付宝  2：微信  3：金币  4：汇联通工会卡
+     * 支付方式： 1：支付宝  2：微信  3：金币  4：汇联通工会卡  5：银联   6：银联分期
      */
     private Integer payType;
 
@@ -101,7 +101,7 @@ public class HighOrder implements Serializable {
     private BigDecimal deductionPrice;
 
     /**
-     * 订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消   6.退款中   7.拒绝退款
+     * 订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消   6.退款中   7.拒绝退款 
      */
     private Integer orderStatus;
 
@@ -165,6 +165,16 @@ public class HighOrder implements Serializable {
      */
     private Long identificationCode;
 
+    /**
+     * 是否分账
+     */
+    private Boolean profitSharingStatus;
+
+    /**
+     * 进账商户号
+     */
+    private String accountMerchantNum;
+
     private String ext1;
 
     private String ext2;
@@ -177,14 +187,6 @@ public class HighOrder implements Serializable {
 
     private Boolean isTyAgent;
 
-    public Boolean getIsTyAgent() {
-        return isTyAgent;
-    }
-
-    public void setIsTyAgent(Boolean tyAgent) {
-        isTyAgent = tyAgent;
-    }
-
     public List<HighChildOrder> getHighChildOrderList() {
         return highChildOrderList;
     }
@@ -201,6 +203,14 @@ public class HighOrder implements Serializable {
         this.highDiscount = highDiscount;
     }
 
+    public Boolean getTyAgent() {
+        return isTyAgent;
+    }
+
+    public void setTyAgent(Boolean tyAgent) {
+        isTyAgent = tyAgent;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -443,6 +453,22 @@ public class HighOrder implements Serializable {
         this.identificationCode = identificationCode;
     }
 
+    public Boolean getProfitSharingStatus() {
+        return profitSharingStatus;
+    }
+
+    public void setProfitSharingStatus(Boolean profitSharingStatus) {
+        this.profitSharingStatus = profitSharingStatus;
+    }
+
+    public String getAccountMerchantNum() {
+        return accountMerchantNum;
+    }
+
+    public void setAccountMerchantNum(String accountMerchantNum) {
+        this.accountMerchantNum = accountMerchantNum;
+    }
+
     public String getExt1() {
         return ext1;
     }
@@ -509,6 +535,8 @@ public class HighOrder implements Serializable {
             && (this.getRefundContent() == null ? other.getRefundContent() == null : this.getRefundContent().equals(other.getRefundContent()))
             && (this.getRefusalRefundContent() == null ? other.getRefusalRefundContent() == null : this.getRefusalRefundContent().equals(other.getRefusalRefundContent()))
             && (this.getIdentificationCode() == null ? other.getIdentificationCode() == null : this.getIdentificationCode().equals(other.getIdentificationCode()))
+            && (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus()))
+            && (this.getAccountMerchantNum() == null ? other.getAccountMerchantNum() == null : this.getAccountMerchantNum().equals(other.getAccountMerchantNum()))
             && (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()));
@@ -548,6 +576,8 @@ public class HighOrder implements Serializable {
         result = prime * result + ((getRefundContent() == null) ? 0 : getRefundContent().hashCode());
         result = prime * result + ((getRefusalRefundContent() == null) ? 0 : getRefusalRefundContent().hashCode());
         result = prime * result + ((getIdentificationCode() == null) ? 0 : getIdentificationCode().hashCode());
+        result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode());
+        result = prime * result + ((getAccountMerchantNum() == null) ? 0 : getAccountMerchantNum().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());
@@ -590,6 +620,8 @@ public class HighOrder implements Serializable {
         sb.append(", refundContent=").append(refundContent);
         sb.append(", refusalRefundContent=").append(refusalRefundContent);
         sb.append(", identificationCode=").append(identificationCode);
+        sb.append(", profitSharingStatus=").append(profitSharingStatus);
+        sb.append(", accountMerchantNum=").append(accountMerchantNum);
         sb.append(", ext1=").append(ext1);
         sb.append(", ext2=").append(ext2);
         sb.append(", ext3=").append(ext3);

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

@@ -2026,6 +2026,136 @@ public class HighOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andProfitSharingStatusIsNull() {
+            addCriterion("profit_sharing_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusIsNotNull() {
+            addCriterion("profit_sharing_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusEqualTo(Boolean value) {
+            addCriterion("profit_sharing_status =", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusNotEqualTo(Boolean value) {
+            addCriterion("profit_sharing_status <>", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusGreaterThan(Boolean value) {
+            addCriterion("profit_sharing_status >", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("profit_sharing_status >=", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusLessThan(Boolean value) {
+            addCriterion("profit_sharing_status <", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusLessThanOrEqualTo(Boolean value) {
+            addCriterion("profit_sharing_status <=", value, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusIn(List<Boolean> values) {
+            addCriterion("profit_sharing_status in", values, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusNotIn(List<Boolean> values) {
+            addCriterion("profit_sharing_status not in", values, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusBetween(Boolean value1, Boolean value2) {
+            addCriterion("profit_sharing_status between", value1, value2, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andProfitSharingStatusNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("profit_sharing_status not between", value1, value2, "profitSharingStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumIsNull() {
+            addCriterion("account_merchant_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumIsNotNull() {
+            addCriterion("account_merchant_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumEqualTo(String value) {
+            addCriterion("account_merchant_num =", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumNotEqualTo(String value) {
+            addCriterion("account_merchant_num <>", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumGreaterThan(String value) {
+            addCriterion("account_merchant_num >", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumGreaterThanOrEqualTo(String value) {
+            addCriterion("account_merchant_num >=", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumLessThan(String value) {
+            addCriterion("account_merchant_num <", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumLessThanOrEqualTo(String value) {
+            addCriterion("account_merchant_num <=", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumLike(String value) {
+            addCriterion("account_merchant_num like", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumNotLike(String value) {
+            addCriterion("account_merchant_num not like", value, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumIn(List<String> values) {
+            addCriterion("account_merchant_num in", values, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumNotIn(List<String> values) {
+            addCriterion("account_merchant_num not in", values, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumBetween(String value1, String value2) {
+            addCriterion("account_merchant_num between", value1, value2, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountMerchantNumNotBetween(String value1, String value2) {
+            addCriterion("account_merchant_num not between", value1, value2, "accountMerchantNum");
+            return (Criteria) this;
+        }
+
         public Criteria andExt1IsNull() {
             addCriterion("ext_1 is null");
             return (Criteria) this;

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

@@ -0,0 +1,246 @@
+package com.hai.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * high_order_split_accounts_record
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class HighOrderSplitAccountsRecord implements Serializable {
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private Integer orderNo;
+
+    /**
+     * 平台类型  1：微信
+     */
+    private Integer type;
+
+    /**
+     * 账户号码
+     */
+    private String accountNo;
+
+    /**
+     * 分账比例
+     */
+    private BigDecimal rate;
+
+    /**
+     * 分账金额
+     */
+    private BigDecimal splitPrice;
+
+    /**
+     * 状态  0：删除  1：待分账   2：分账成功   3：分账失败
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    private String ext1;
+
+    private String ext2;
+
+    private String ext3;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public BigDecimal getRate() {
+        return rate;
+    }
+
+    public void setRate(BigDecimal rate) {
+        this.rate = rate;
+    }
+
+    public BigDecimal getSplitPrice() {
+        return splitPrice;
+    }
+
+    public void setSplitPrice(BigDecimal splitPrice) {
+        this.splitPrice = splitPrice;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    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 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;
+        }
+        HighOrderSplitAccountsRecord other = (HighOrderSplitAccountsRecord) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
+            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getAccountNo() == null ? other.getAccountNo() == null : this.getAccountNo().equals(other.getAccountNo()))
+            && (this.getRate() == null ? other.getRate() == null : this.getRate().equals(other.getRate()))
+            && (this.getSplitPrice() == null ? other.getSplitPrice() == null : this.getSplitPrice().equals(other.getSplitPrice()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
+            && (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 + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
+        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getAccountNo() == null) ? 0 : getAccountNo().hashCode());
+        result = prime * result + ((getRate() == null) ? 0 : getRate().hashCode());
+        result = prime * result + ((getSplitPrice() == null) ? 0 : getSplitPrice().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().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(", orderId=").append(orderId);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", type=").append(type);
+        sb.append(", accountNo=").append(accountNo);
+        sb.append(", rate=").append(rate);
+        sb.append(", splitPrice=").append(splitPrice);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        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/model/HighMerchantStoreModel.java

@@ -32,4 +32,5 @@ public class HighMerchantStoreModel extends HighMerchantStore {
     public void setHighMerchant(HighMerchant highMerchant) {
         this.highMerchant = highMerchant;
     }
+
 }

hai-service/src/main/java/com/hai/service/HighMerchantTripartitePlatformService.java

@@ -0,0 +1,20 @@
+package com.hai.service;
+
+import com.hai.entity.HighMerchantTripartitePlatform;
+
+public interface HighMerchantTripartitePlatformService {
+
+    /**
+     * 编辑数据
+     * @param tripartitePlatform
+     */
+    void editDate(HighMerchantTripartitePlatform tripartitePlatform);
+
+    /**
+     * 查询详情
+     * @param merId
+     * @param platformType
+     * @return
+     */
+    HighMerchantTripartitePlatform getDetail(Long merId,Integer platformType);
+}

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

@@ -1,9 +1,6 @@
 package com.hai.service.impl;
 
-
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;

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

@@ -0,0 +1,42 @@
+package com.hai.service.impl;
+
+import com.hai.dao.HighMerchantTripartitePlatformMapper;
+import com.hai.entity.HighMerchantTripartitePlatform;
+import com.hai.entity.HighMerchantTripartitePlatformExample;
+import com.hai.service.HighMerchantTripartitePlatformService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service("merchantTripartitePlatformService")
+public class HighMerchantTripartitePlatformServiceImpl implements HighMerchantTripartitePlatformService {
+
+    @Resource
+    private HighMerchantTripartitePlatformMapper merchantTripartitePlatformMapper;
+
+    @Override
+    public void editDate(HighMerchantTripartitePlatform tripartitePlatform) {
+       if (tripartitePlatform.getId() == null) {
+           tripartitePlatform.setStatus(1);
+           tripartitePlatform.setCreateTime(new Date());
+           tripartitePlatform.setUpdateTime(new Date());
+           merchantTripartitePlatformMapper.insert(tripartitePlatform);
+       } else {
+           tripartitePlatform.setUpdateTime(new Date());
+           merchantTripartitePlatformMapper.updateByPrimaryKey(tripartitePlatform);
+       }
+    }
+
+    @Override
+    public HighMerchantTripartitePlatform getDetail(Long merId, Integer platformType) {
+        HighMerchantTripartitePlatformExample example = new HighMerchantTripartitePlatformExample();
+        example.createCriteria().andMerIdEqualTo(merId).andPlatformTypeEqualTo(platformType);
+        List<HighMerchantTripartitePlatform> list = merchantTripartitePlatformMapper.selectByExample(example);
+        if (list.size() > 0) {
+            return list.get(0);
+        }
+        return null;
+    }
+}

hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java

@@ -442,33 +442,41 @@ public class GoodsOrderServiceImpl implements PayService {
 
 
                 if (order.getHighChildOrderList().get(0).getGoodsType().equals(3)) {
-                    new Thread(() -> {
-                        Map<String, Object> pushMsg = new HashMap<>();
-                        pushMsg.put("userId", order.getHighChildOrderList().get(0).getGoodsId());
-
-                        Map<String, Object> msgContent = new HashMap<>();
-                        msgContent.put("order", highOrderService.getGasOrderDetail(order.getOrderNo()));
-                        msgContent.put("voice", baiduVoiceService.text2audio(order.getHighChildOrderList().get(0).getGoodsName() + "，收款：" + order.getTotalPrice() + "元"));
-                        pushMsg.put("message", JSONObject.toJSONString(msgContent));
-                        HttpsUtils.doPost("http://127.0.0.1:9901/msg/websocket/websocket", pushMsg, new HashMap<>());
-                    }).start();
-
-                    new Thread(() -> {
-                        try {
-                            Thread.sleep(120*1000);
-                            BigDecimal rake = new BigDecimal("0.01");
-
-                            // 计算微信收取的手续费     支付金额 * 0.002      注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
-                            BigDecimal wxHandlingFee = order.getPayRealPrice().multiply(new BigDecimal("0.002")).setScale(2,BigDecimal.ROUND_HALF_DOWN);
-                            BigDecimal price = order.getPayRealPrice().subtract(wxHandlingFee);
-
-                            // 计算分账金额    手续费后的价格 * 0.05  注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
-                            BigDecimal profitSharingAmount = price.multiply(rake).setScale(2,BigDecimal.ROUND_DOWN);
-                            this.wxGasProfitsharing(order.getExt1(), order.getPaySerialNo(),order.getOrderNo(),profitSharingAmount);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+                    // 加油站
+                    HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(order.getHighChildOrderList().get(0).getGoodsId());
+                    if (store != null) {
+                        if (store.getSourceType() != null && store.getSourceType().equals(1)) {
+                            new Thread(() -> {
+                                Map<String, Object> pushMsg = new HashMap<>();
+                                pushMsg.put("userId", order.getHighChildOrderList().get(0).getGoodsId());
+
+                                Map<String, Object> msgContent = new HashMap<>();
+                                msgContent.put("order", highOrderService.getGasOrderDetail(order.getOrderNo()));
+                                msgContent.put("voice", baiduVoiceService.text2audio(order.getHighChildOrderList().get(0).getGoodsName() + "，收款：" + order.getTotalPrice() + "元"));
+                                pushMsg.put("message", JSONObject.toJSONString(msgContent));
+                                HttpsUtils.doPost("http://127.0.0.1:9901/msg/websocket/websocket", pushMsg, new HashMap<>());
+                            }).start();
                         }
-                    }).start();
+                    }
+
+                    if (order.getProfitSharingStatus() == true) {
+                        new Thread(() -> {
+                            try {
+                                Thread.sleep(120*1000);
+                                BigDecimal rake = new BigDecimal("0.01");
+
+                                // 计算微信收取的手续费     支付金额 * 0.002      注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
+                                BigDecimal wxHandlingFee = order.getPayRealPrice().multiply(new BigDecimal("0.002")).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+                                BigDecimal price = order.getPayRealPrice().subtract(wxHandlingFee);
+
+                                // 计算分账金额    手续费后的价格 * 0.05  注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
+                                BigDecimal profitSharingAmount = price.multiply(rake).setScale(2,BigDecimal.ROUND_DOWN);
+                                this.wxGasProfitsharing(order.getExt1(), order.getAccountMerchantNum(), order.getPaySerialNo(),order.getOrderNo(),profitSharingAmount);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+                    }
                 } else {
                     new Thread(() -> {
                         try {
@@ -504,12 +512,12 @@ public class GoodsOrderServiceImpl implements PayService {
         System.out.println("实际分账价格：" + profitSharingAmount);
     }
 
-    public void wxGasProfitsharing(String appid, String transaction_id,String out_order_no, BigDecimal amount) {
+    public void wxGasProfitsharing(String appid, String subMchId, String transaction_id,String out_order_no, BigDecimal amount) {
         try {
             Map<String,String> param = new LinkedHashMap<>();
             param.put("appid", appid);
             param.put("mch_id", "1289663601");
-            param.put("sub_mch_id" , "1624126902"); // 渝北区浩联物资经营部
+            param.put("sub_mch_id" , subMchId); // 渝北区浩联物资经营部
             param.put("transaction_id" , transaction_id);
             param.put("out_order_no" , out_order_no);
             param.put("nonce_str" , WxUtils.makeNonStr());