Merge branch 'master' of http://gitlab.jntmedia.cn/guanchen/huhu-partner

pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -100,14 +100,14 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.1.17</version>
+            <version>1.1.18</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.17</version>
+            <version>1.1.18</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
         <dependency>

src/main/java/com/lanren/huhu/partner/dao/OrderTaobaoJdCommissionMapper.java

+package com.lanren.huhu.partner.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface OrderTaobaoJdCommissionMapper extends BaseMapper<OrderTaobaoJdCommission> {
+    int updateBatch(List<OrderTaobaoJdCommission> list);
+
+    int batchInsert(@Param("list") List<OrderTaobaoJdCommission> list);
+
+    int insertOrUpdate(OrderTaobaoJdCommission record);
+
+    int insertOrUpdateSelective(OrderTaobaoJdCommission record);
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/OrderTaobaoJdCommission.java

+package com.lanren.huhu.partner.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author houseme
+ */
+@Data
+@TableName(value = "huhu.order_taobao_jd_commission")
+public class OrderTaobaoJdCommission implements Serializable {
+    /**
+     * 订单类型 taobao:淘宝,jd:京东
+     */
+     @TableId(value = "type", type = IdType.INPUT)
+    private String type;
+
+    /**
+     * 订单号
+     */
+     @TableId(value = "order_sn", type = IdType.AUTO)
+    private String orderSn;
+
+    /**
+     * 父订单号
+     */
+    @TableField(value = "order_sn_parent")
+    private String orderSnParent;
+
+    /**
+     * 是否是父订单
+     */
+    @TableField(value = "is_parent")
+    private Integer isParent;
+
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    private String title;
+
+    /**
+     * 预估佣金
+     */
+    @TableField(value = "estimate_effect")
+    private BigDecimal estimateEffect;
+
+    /**
+     * 实际结算佣金
+     */
+    @TableField(value = "commission_amount")
+    private BigDecimal commissionAmount;
+
+    /**
+     * 维权退款返还佣金
+     */
+    @TableField(value = "refund_amount")
+    private BigDecimal refundAmount;
+
+    /**
+     * 变现金额
+     */
+    @TableField(value = "money")
+    private BigDecimal money;
+
+    /**
+     * 乘系数之前的给用户返佣金额
+     */
+    @TableField(value = "all_money")
+    private BigDecimal allMoney;
+
+    /**
+     * 0未付款 1付款 3 结算 -3失效
+     */
+    @TableField(value = "status")
+    private Integer status;
+
+    /**
+     * 订单创建时间
+     */
+    @TableField(value = "create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 结算时间
+     */
+    @TableField(value = "settle_time")
+    private LocalDateTime settleTime;
+
+    /**
+     * 倒计时最后时间
+     */
+    @TableField(value = "last_time")
+    private LocalDateTime lastTime;
+
+    /**
+     * 用户实际支付金额
+     */
+    @TableField(value = "amount")
+    private BigDecimal amount;
+
+    @TableField(value = "created_at")
+    private Integer createdAt;
+
+    @TableField(value = "updated_at")
+    private Integer updatedAt;
+
+    @TableField(value = "deleted_at")
+    private Integer deletedAt;
+
+    @TableField(value = "user_id")
+    private Integer userId;
+
+    /**
+     * 100 待激活 200 待结算 300 已结算
+     */
+    @TableField(value = "active_state")
+    private Integer activeState;
+
+    @TableField(value = "post_time")
+    private LocalDateTime postTime;
+
+    @TableField(value = "active_time")
+    private LocalDateTime activeTime;
+
+    /**
+     * 广告位名称
+     */
+    @TableField(value = "pname")
+    private String pname;
+
+    /**
+     * 是否预付订金订单 1是0否
+     */
+    @TableField(value = "has_deposit")
+    private Integer hasDeposit;
+
+    /**
+     * 已激活用户显示当前佣金, 新用户显示预估佣金
+     */
+    @TableField(value = "commission_snapshot")
+    private BigDecimal commissionSnapshot;
+
+    /**
+     * 是否是新人专享
+     */
+    @TableField(value = "is_for_new")
+    private Integer isForNew;
+
+    /**
+     * 呼呼补贴金额快照
+     */
+    @TableField(value = "huhu_subsidy_snapshot")
+    private BigDecimal huhuSubsidySnapshot;
+
+    /**
+     * 呼呼补贴金额实际
+     */
+    @TableField(value = "huhu_subsidy_actual")
+    private BigDecimal huhuSubsidyActual;
+
+    /**
+     * 不给呼呼邀请奖励: 1不给 0给
+     */
+    @TableField(value = "no_invite_reward")
+    private Integer noInviteReward;
+
+    /**
+     * 商品购买数量
+     */
+    @TableField(value = "goods_cnt")
+    private Integer goodsCnt;
+
+    /**
+     * 呼呼返佣比例
+     */
+    @TableField(value = "huhu_commission_rate")
+    private BigDecimal huhuCommissionRate;
+
+    @TableField(value = "insert_time")
+    private LocalDateTime insertTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ORDER_SN_PARENT = "order_sn_parent";
+
+    public static final String COL_IS_PARENT = "is_parent";
+
+    public static final String COL_TITLE = "title";
+
+    public static final String COL_ESTIMATE_EFFECT = "estimate_effect";
+
+    public static final String COL_COMMISSION_AMOUNT = "commission_amount";
+
+    public static final String COL_REFUND_AMOUNT = "refund_amount";
+
+    public static final String COL_MONEY = "money";
+
+    public static final String COL_ALL_MONEY = "all_money";
+
+    public static final String COL_STATUS = "status";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_SETTLE_TIME = "settle_time";
+
+    public static final String COL_LAST_TIME = "last_time";
+
+    public static final String COL_AMOUNT = "amount";
+
+    public static final String COL_CREATED_AT = "created_at";
+
+    public static final String COL_UPDATED_AT = "updated_at";
+
+    public static final String COL_DELETED_AT = "deleted_at";
+
+    public static final String COL_USER_ID = "user_id";
+
+    public static final String COL_ACTIVE_STATE = "active_state";
+
+    public static final String COL_POST_TIME = "post_time";
+
+    public static final String COL_ACTIVE_TIME = "active_time";
+
+    public static final String COL_PNAME = "pname";
+
+    public static final String COL_HAS_DEPOSIT = "has_deposit";
+
+    public static final String COL_COMMISSION_SNAPSHOT = "commission_snapshot";
+
+    public static final String COL_IS_FOR_NEW = "is_for_new";
+
+    public static final String COL_HUHU_SUBSIDY_SNAPSHOT = "huhu_subsidy_snapshot";
+
+    public static final String COL_HUHU_SUBSIDY_ACTUAL = "huhu_subsidy_actual";
+
+    public static final String COL_NO_INVITE_REWARD = "no_invite_reward";
+
+    public static final String COL_GOODS_CNT = "goods_cnt";
+
+    public static final String COL_HUHU_COMMISSION_RATE = "huhu_commission_rate";
+
+    public static final String COL_INSERT_TIME = "insert_time";
+}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/manager/OrderTaobaoJdCommissionManager.java

+package com.lanren.huhu.partner.manager;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;import com.lanren.huhu.partner.service.OrderTaobaoJdCommissionService;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Component;
/**
 * @author houseme
 * @date 2019-07-01 14:45
 * @Project partner
 * @Package com.lanren.huhu.partner.manager
 * @File: OrderTaobaoJdCommissionManager
 */@Componentpublic class OrderTaobaoJdCommissionManager {

    private static Logger logger = LoggerFactory.getLogger(OrderTaobaoJdCommissionManager.class);

    @Autowired
    private OrderTaobaoJdCommissionService orderTaobaoJdCommissionService;

    public void one() {
        QueryWrapper<OrderTaobaoJdCommission> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("order_sn", "511853890422935938 ");
        System.out.println(queryWrapper);
        System.out.println(orderTaobaoJdCommissionService.getOne(queryWrapper));
    }}
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/service/OrderTaobaoJdCommissionService.java

+package com.lanren.huhu.partner.service;
+
+import java.util.List;
+import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;
+import com.baomidou.mybatisplus.extension.service.IService;
+    /**
+ *
+ * @author houseme
+ * @date 2019-07-01 14:43
+ * @Project partner
+ * @Package ${PACKAGE_NAME}
+ * @File: ${NAME}
+ */
+public interface OrderTaobaoJdCommissionService extends IService<OrderTaobaoJdCommission>{
+
+
+    int updateBatch(List<OrderTaobaoJdCommission> list);
+
+    int batchInsert(List<OrderTaobaoJdCommission> list);
+
+    int insertOrUpdate(OrderTaobaoJdCommission record);
+
+    int insertOrUpdateSelective(OrderTaobaoJdCommission record);
+
+}

src/main/java/com/lanren/huhu/partner/service/impl/OrderTaobaoJdCommissionServiceImpl.java

+package com.lanren.huhu.partner.service.impl;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import com.lanren.huhu.partner.domain.OrderTaobaoJdCommission;
+import com.lanren.huhu.partner.dao.OrderTaobaoJdCommissionMapper;
+import com.lanren.huhu.partner.service.OrderTaobaoJdCommissionService;
+/**
+ *
+ * @author houseme
+ * @date 2019-07-01 14:43
+ * @Project partner
+ * @Package ${PACKAGE_NAME}
+ * @File: ${NAME}
+ */
+@Service
+public class OrderTaobaoJdCommissionServiceImpl extends ServiceImpl<OrderTaobaoJdCommissionMapper, OrderTaobaoJdCommission> implements OrderTaobaoJdCommissionService{
+
+    @Override
+    public int updateBatch(List<OrderTaobaoJdCommission> list) {
+        return baseMapper.updateBatch(list);
+    }
+    @Override
+    public int batchInsert(List<OrderTaobaoJdCommission> list) {
+        return baseMapper.batchInsert(list);
+    }
+    @Override
+    public int insertOrUpdate(OrderTaobaoJdCommission record) {
+        return baseMapper.insertOrUpdate(record);
+    }
+    @Override
+    public int insertOrUpdateSelective(OrderTaobaoJdCommission record) {
+        return baseMapper.insertOrUpdateSelective(record);
+    }
+}

src/main/resources/mapper/OrderTaobaoJdCommissionMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lanren.huhu.partner.dao.OrderTaobaoJdCommissionMapper">
+  <resultMap id="BaseResultMap" type="com.lanren.huhu.partner.domain.OrderTaobaoJdCommission">
+    <!--@mbg.generated-->
+    <id column="type" property="type" />
+    <id column="order_sn" property="orderSn" />
+    <result column="order_sn_parent" property="orderSnParent" />
+    <result column="is_parent" property="isParent" />
+    <result column="title" property="title" />
+    <result column="estimate_effect" property="estimateEffect" />
+    <result column="commission_amount" property="commissionAmount" />
+    <result column="refund_amount" property="refundAmount" />
+    <result column="money" property="money" />
+    <result column="all_money" property="allMoney" />
+    <result column="status" property="status" />
+    <result column="create_time" property="createTime" />
+    <result column="settle_time" property="settleTime" />
+    <result column="last_time" property="lastTime" />
+    <result column="amount" property="amount" />
+    <result column="created_at" property="createdAt" />
+    <result column="updated_at" property="updatedAt" />
+    <result column="deleted_at" property="deletedAt" />
+    <result column="user_id" property="userId" />
+    <result column="active_state" property="activeState" />
+    <result column="post_time" property="postTime" />
+    <result column="active_time" property="activeTime" />
+    <result column="pname" property="pname" />
+    <result column="has_deposit" property="hasDeposit" />
+    <result column="commission_snapshot" property="commissionSnapshot" />
+    <result column="is_for_new" property="isForNew" />
+    <result column="huhu_subsidy_snapshot" property="huhuSubsidySnapshot" />
+    <result column="huhu_subsidy_actual" property="huhuSubsidyActual" />
+    <result column="no_invite_reward" property="noInviteReward" />
+    <result column="goods_cnt" property="goodsCnt" />
+    <result column="huhu_commission_rate" property="huhuCommissionRate" />
+    <result column="insert_time" property="insertTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    `type`, order_sn, order_sn_parent, is_parent, title, estimate_effect, commission_amount, 
+    refund_amount, money, all_money, `status`, create_time, settle_time, last_time, amount, 
+    created_at, updated_at, deleted_at, user_id, active_state, post_time, active_time, 
+    pname, has_deposit, commission_snapshot, is_for_new, huhu_subsidy_snapshot, huhu_subsidy_actual, 
+    no_invite_reward, goods_cnt, huhu_commission_rate, insert_time
+  </sql>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update huhu.order_taobao_jd_commission
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="order_sn_parent = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.orderSnParent}
+        </foreach>
+      </trim>
+      <trim prefix="is_parent = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.isParent}
+        </foreach>
+      </trim>
+      <trim prefix="title = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.title}
+        </foreach>
+      </trim>
+      <trim prefix="estimate_effect = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.estimateEffect}
+        </foreach>
+      </trim>
+      <trim prefix="commission_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.commissionAmount}
+        </foreach>
+      </trim>
+      <trim prefix="refund_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.refundAmount}
+        </foreach>
+      </trim>
+      <trim prefix="money = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.money}
+        </foreach>
+      </trim>
+      <trim prefix="all_money = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.allMoney}
+        </foreach>
+      </trim>
+      <trim prefix="`status` = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.status}
+        </foreach>
+      </trim>
+      <trim prefix="create_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.createTime}
+        </foreach>
+      </trim>
+      <trim prefix="settle_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.settleTime}
+        </foreach>
+      </trim>
+      <trim prefix="last_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.lastTime}
+        </foreach>
+      </trim>
+      <trim prefix="amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.amount}
+        </foreach>
+      </trim>
+      <trim prefix="created_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.createdAt}
+        </foreach>
+      </trim>
+      <trim prefix="updated_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.updatedAt}
+        </foreach>
+      </trim>
+      <trim prefix="deleted_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.deletedAt}
+        </foreach>
+      </trim>
+      <trim prefix="user_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.userId}
+        </foreach>
+      </trim>
+      <trim prefix="active_state = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.activeState}
+        </foreach>
+      </trim>
+      <trim prefix="post_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.postTime}
+        </foreach>
+      </trim>
+      <trim prefix="active_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.activeTime}
+        </foreach>
+      </trim>
+      <trim prefix="pname = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.pname}
+        </foreach>
+      </trim>
+      <trim prefix="has_deposit = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.hasDeposit}
+        </foreach>
+      </trim>
+      <trim prefix="commission_snapshot = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.commissionSnapshot}
+        </foreach>
+      </trim>
+      <trim prefix="is_for_new = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.isForNew}
+        </foreach>
+      </trim>
+      <trim prefix="huhu_subsidy_snapshot = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.huhuSubsidySnapshot}
+        </foreach>
+      </trim>
+      <trim prefix="huhu_subsidy_actual = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.huhuSubsidyActual}
+        </foreach>
+      </trim>
+      <trim prefix="no_invite_reward = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.noInviteReward}
+        </foreach>
+      </trim>
+      <trim prefix="goods_cnt = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.goodsCnt}
+        </foreach>
+      </trim>
+      <trim prefix="huhu_commission_rate = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.huhuCommissionRate}
+        </foreach>
+      </trim>
+      <trim prefix="insert_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when `type` = #{item.type} then #{item.insertTime}
+        </foreach>
+      </trim>
+    </trim>
+    where `type` in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.type}
+    </foreach>
+  </update>
+  <insert id="batchInsert" keyColumn="order_sn" keyProperty="orderSn" parameterType="map" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into huhu.order_taobao_jd_commission
+    (`type`, order_sn_parent, is_parent, title, estimate_effect, commission_amount, refund_amount, 
+      money, all_money, `status`, create_time, settle_time, last_time, amount, created_at, 
+      updated_at, deleted_at, user_id, active_state, post_time, active_time, pname, has_deposit, 
+      commission_snapshot, is_for_new, huhu_subsidy_snapshot, huhu_subsidy_actual, no_invite_reward, 
+      goods_cnt, huhu_commission_rate, insert_time)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.type}, #{item.orderSnParent}, #{item.isParent}, #{item.title}, #{item.estimateEffect}, 
+        #{item.commissionAmount}, #{item.refundAmount}, #{item.money}, #{item.allMoney}, 
+        #{item.status}, #{item.createTime}, #{item.settleTime}, #{item.lastTime}, #{item.amount}, 
+        #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt}, #{item.userId}, #{item.activeState}, 
+        #{item.postTime}, #{item.activeTime}, #{item.pname}, #{item.hasDeposit}, #{item.commissionSnapshot}, 
+        #{item.isForNew}, #{item.huhuSubsidySnapshot}, #{item.huhuSubsidyActual}, #{item.noInviteReward}, 
+        #{item.goodsCnt}, #{item.huhuCommissionRate}, #{item.insertTime})
+    </foreach>
+  </insert>
+  <insert id="insertOrUpdate" keyColumn="order_sn" keyProperty="orderSn" parameterType="com.lanren.huhu.partner.domain.OrderTaobaoJdCommission" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into huhu.order_taobao_jd_commission
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      `type`,
+      <if test="orderSn != null">
+        order_sn,
+      </if>
+      order_sn_parent,
+      is_parent,
+      title,
+      estimate_effect,
+      commission_amount,
+      refund_amount,
+      money,
+      all_money,
+      `status`,
+      create_time,
+      settle_time,
+      last_time,
+      amount,
+      created_at,
+      updated_at,
+      deleted_at,
+      user_id,
+      active_state,
+      post_time,
+      active_time,
+      pname,
+      has_deposit,
+      commission_snapshot,
+      is_for_new,
+      huhu_subsidy_snapshot,
+      huhu_subsidy_actual,
+      no_invite_reward,
+      goods_cnt,
+      huhu_commission_rate,
+      insert_time,
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      #{type},
+      <if test="orderSn != null">
+        #{orderSn},
+      </if>
+      #{orderSnParent},
+      #{isParent},
+      #{title},
+      #{estimateEffect},
+      #{commissionAmount},
+      #{refundAmount},
+      #{money},
+      #{allMoney},
+      #{status},
+      #{createTime},
+      #{settleTime},
+      #{lastTime},
+      #{amount},
+      #{createdAt},
+      #{updatedAt},
+      #{deletedAt},
+      #{userId},
+      #{activeState},
+      #{postTime},
+      #{activeTime},
+      #{pname},
+      #{hasDeposit},
+      #{commissionSnapshot},
+      #{isForNew},
+      #{huhuSubsidySnapshot},
+      #{huhuSubsidyActual},
+      #{noInviteReward},
+      #{goodsCnt},
+      #{huhuCommissionRate},
+      #{insertTime},
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      `type` = #{type},
+      <if test="orderSn != null">
+        order_sn = #{orderSn},
+      </if>
+      order_sn_parent = #{orderSnParent},
+      is_parent = #{isParent},
+      title = #{title},
+      estimate_effect = #{estimateEffect},
+      commission_amount = #{commissionAmount},
+      refund_amount = #{refundAmount},
+      money = #{money},
+      all_money = #{allMoney},
+      `status` = #{status},
+      create_time = #{createTime},
+      settle_time = #{settleTime},
+      last_time = #{lastTime},
+      amount = #{amount},
+      created_at = #{createdAt},
+      updated_at = #{updatedAt},
+      deleted_at = #{deletedAt},
+      user_id = #{userId},
+      active_state = #{activeState},
+      post_time = #{postTime},
+      active_time = #{activeTime},
+      pname = #{pname},
+      has_deposit = #{hasDeposit},
+      commission_snapshot = #{commissionSnapshot},
+      is_for_new = #{isForNew},
+      huhu_subsidy_snapshot = #{huhuSubsidySnapshot},
+      huhu_subsidy_actual = #{huhuSubsidyActual},
+      no_invite_reward = #{noInviteReward},
+      goods_cnt = #{goodsCnt},
+      huhu_commission_rate = #{huhuCommissionRate},
+      insert_time = #{insertTime},
+    </trim>
+  </insert>
+  <insert id="insertOrUpdateSelective" keyColumn="order_sn" keyProperty="orderSn" parameterType="com.lanren.huhu.partner.domain.OrderTaobaoJdCommission" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into huhu.order_taobao_jd_commission
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="type != null">
+        `type`,
+      </if>
+      <if test="orderSn != null">
+        order_sn,
+      </if>
+      <if test="orderSnParent != null">
+        order_sn_parent,
+      </if>
+      <if test="isParent != null">
+        is_parent,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="estimateEffect != null">
+        estimate_effect,
+      </if>
+      <if test="commissionAmount != null">
+        commission_amount,
+      </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
+      <if test="money != null">
+        money,
+      </if>
+      <if test="allMoney != null">
+        all_money,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="settleTime != null">
+        settle_time,
+      </if>
+      <if test="lastTime != null">
+        last_time,
+      </if>
+      <if test="amount != null">
+        amount,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="deletedAt != null">
+        deleted_at,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="activeState != null">
+        active_state,
+      </if>
+      <if test="postTime != null">
+        post_time,
+      </if>
+      <if test="activeTime != null">
+        active_time,
+      </if>
+      <if test="pname != null">
+        pname,
+      </if>
+      <if test="hasDeposit != null">
+        has_deposit,
+      </if>
+      <if test="commissionSnapshot != null">
+        commission_snapshot,
+      </if>
+      <if test="isForNew != null">
+        is_for_new,
+      </if>
+      <if test="huhuSubsidySnapshot != null">
+        huhu_subsidy_snapshot,
+      </if>
+      <if test="huhuSubsidyActual != null">
+        huhu_subsidy_actual,
+      </if>
+      <if test="noInviteReward != null">
+        no_invite_reward,
+      </if>
+      <if test="goodsCnt != null">
+        goods_cnt,
+      </if>
+      <if test="huhuCommissionRate != null">
+        huhu_commission_rate,
+      </if>
+      <if test="insertTime != null">
+        insert_time,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="type != null">
+        #{type},
+      </if>
+      <if test="orderSn != null">
+        #{orderSn},
+      </if>
+      <if test="orderSnParent != null">
+        #{orderSnParent},
+      </if>
+      <if test="isParent != null">
+        #{isParent},
+      </if>
+      <if test="title != null">
+        #{title},
+      </if>
+      <if test="estimateEffect != null">
+        #{estimateEffect},
+      </if>
+      <if test="commissionAmount != null">
+        #{commissionAmount},
+      </if>
+      <if test="refundAmount != null">
+        #{refundAmount},
+      </if>
+      <if test="money != null">
+        #{money},
+      </if>
+      <if test="allMoney != null">
+        #{allMoney},
+      </if>
+      <if test="status != null">
+        #{status},
+      </if>
+      <if test="createTime != null">
+        #{createTime},
+      </if>
+      <if test="settleTime != null">
+        #{settleTime},
+      </if>
+      <if test="lastTime != null">
+        #{lastTime},
+      </if>
+      <if test="amount != null">
+        #{amount},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt},
+      </if>
+      <if test="deletedAt != null">
+        #{deletedAt},
+      </if>
+      <if test="userId != null">
+        #{userId},
+      </if>
+      <if test="activeState != null">
+        #{activeState},
+      </if>
+      <if test="postTime != null">
+        #{postTime},
+      </if>
+      <if test="activeTime != null">
+        #{activeTime},
+      </if>
+      <if test="pname != null">
+        #{pname},
+      </if>
+      <if test="hasDeposit != null">
+        #{hasDeposit},
+      </if>
+      <if test="commissionSnapshot != null">
+        #{commissionSnapshot},
+      </if>
+      <if test="isForNew != null">
+        #{isForNew},
+      </if>
+      <if test="huhuSubsidySnapshot != null">
+        #{huhuSubsidySnapshot},
+      </if>
+      <if test="huhuSubsidyActual != null">
+        #{huhuSubsidyActual},
+      </if>
+      <if test="noInviteReward != null">
+        #{noInviteReward},
+      </if>
+      <if test="goodsCnt != null">
+        #{goodsCnt},
+      </if>
+      <if test="huhuCommissionRate != null">
+        #{huhuCommissionRate},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime},
+      </if>
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="type != null">
+        `type` = #{type},
+      </if>
+      <if test="orderSn != null">
+        order_sn = #{orderSn},
+      </if>
+      <if test="orderSnParent != null">
+        order_sn_parent = #{orderSnParent},
+      </if>
+      <if test="isParent != null">
+        is_parent = #{isParent},
+      </if>
+      <if test="title != null">
+        title = #{title},
+      </if>
+      <if test="estimateEffect != null">
+        estimate_effect = #{estimateEffect},
+      </if>
+      <if test="commissionAmount != null">
+        commission_amount = #{commissionAmount},
+      </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount},
+      </if>
+      <if test="money != null">
+        money = #{money},
+      </if>
+      <if test="allMoney != null">
+        all_money = #{allMoney},
+      </if>
+      <if test="status != null">
+        `status` = #{status},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime},
+      </if>
+      <if test="settleTime != null">
+        settle_time = #{settleTime},
+      </if>
+      <if test="lastTime != null">
+        last_time = #{lastTime},
+      </if>
+      <if test="amount != null">
+        amount = #{amount},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt},
+      </if>
+      <if test="deletedAt != null">
+        deleted_at = #{deletedAt},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId},
+      </if>
+      <if test="activeState != null">
+        active_state = #{activeState},
+      </if>
+      <if test="postTime != null">
+        post_time = #{postTime},
+      </if>
+      <if test="activeTime != null">
+        active_time = #{activeTime},
+      </if>
+      <if test="pname != null">
+        pname = #{pname},
+      </if>
+      <if test="hasDeposit != null">
+        has_deposit = #{hasDeposit},
+      </if>
+      <if test="commissionSnapshot != null">
+        commission_snapshot = #{commissionSnapshot},
+      </if>
+      <if test="isForNew != null">
+        is_for_new = #{isForNew},
+      </if>
+      <if test="huhuSubsidySnapshot != null">
+        huhu_subsidy_snapshot = #{huhuSubsidySnapshot},
+      </if>
+      <if test="huhuSubsidyActual != null">
+        huhu_subsidy_actual = #{huhuSubsidyActual},
+      </if>
+      <if test="noInviteReward != null">
+        no_invite_reward = #{noInviteReward},
+      </if>
+      <if test="goodsCnt != null">
+        goods_cnt = #{goodsCnt},
+      </if>
+      <if test="huhuCommissionRate != null">
+        huhu_commission_rate = #{huhuCommissionRate},
+      </if>
+      <if test="insertTime != null">
+        insert_time = #{insertTime},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file