xubh před 4 roky
rodič
revize
5a0ffbcafb

+ 1 - 1
src/main/java/com/minpay/common/action/GamePayAction.java

@@ -207,7 +207,7 @@ public class GamePayAction implements IMINAction {
 		// 查询账户是否存在
 		VmAccountExample accExp = new VmAccountExample();
 		// 01:基本账户
-		accExp.createCriteria().andChannelEqualTo(user.getChannel()).andUsridEqualTo(user.getId()).andTypeEqualTo("01").andEquipmentIdEqualTo(equNo);
+		accExp.createCriteria().andChannelEqualTo(user.getChannel()).andUsridEqualTo(user.getId()).andTypeEqualTo("01").andEquipmentIdEqualTo(equNo).andIsbranchEqualTo("0");
 		
 		List<VmAccount> accList = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmAccountMapper.class).selectByExample(accExp);
 		if(accList == null || accList.size() == 0) {

+ 12 - 1
src/main/java/com/minpay/common/pay/ShouhuoPay.java

@@ -455,9 +455,20 @@ public class ShouhuoPay implements IMINAction{
 			}
 			// 充值
 			else if("02".equals(orderInf.getProType())) {
+
+				/**查询调账金额*/
+				VmRechargeRule vmRechargeRule = Service.lookup(IMINDataBaseService.class)
+						.getMybatisMapper(VmRechargeRuleMapper.class).selectByPrimaryKey(orderInf.getRechareRuleId());
+				if(vmRechargeRule != null){
+
+				}
+				String giveAmt =  vmRechargeRule.getGiveAmt();
+				String rechargeAmt = vmRechargeRule.getRechargeAmt();
+				String allAmt = CommonUtil.add(giveAmt, rechargeAmt);
+
 				// 00充值(CZ)
 				//todo 添加机器编号
-				service.modfiyAccount(orderInf.getChannel(), orderInf.getPersonId(), "01", amt, "00", payMentList.get(0).getFlowno(), "充值",orderInf.getEquipmentId());
+				service.modfiyAccount(orderInf.getChannel(), orderInf.getPersonId(), "01", allAmt, "00", payMentList.get(0).getFlowno(), "充值",orderInf.getEquipmentId());
 			}
 		}
 	}

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

@@ -61,7 +61,7 @@ public class AccountServiceImpl implements IAccountService {
 		account.setCreateUser(userId);
 		account.setAmt("0");
 		account.setAvaAmt("0");
-		Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmAccountMapper.class).insert(account);
+		Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmAccountMapper.class).insertSelective(account);
 	}
 	
 	/**
@@ -82,7 +82,7 @@ public class AccountServiceImpl implements IAccountService {
 			throws BusinessCodeException, MINBusinessException {
 		
 		VmAccountExample accExp = new VmAccountExample();
-		accExp.createCriteria().andChannelEqualTo(channel).andUsridEqualTo(userId).andTypeEqualTo(accType).andEquipmentIdEqualTo(equipmentId);
+		accExp.createCriteria().andChannelEqualTo(channel).andUsridEqualTo(userId).andTypeEqualTo(accType).andEquipmentIdEqualTo(equipmentId).andIsbranchEqualTo("0");
 		
 		List<VmAccount> accList = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmAccountMapper.class).selectByExample(accExp);
 		if(accList == null || accList.size() == 0) {

+ 32 - 0
src/main/java/com/minpay/db/table/model/VmAccount.java

@@ -116,6 +116,14 @@ public class VmAccount extends AbstractMINBean {
     private String equipmentId;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_account.ACT_ISBRANCH
+     *
+     * @mbggenerated
+     */
+    private String isbranch;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_account.ACT_ID
      *
@@ -450,4 +458,28 @@ public class VmAccount extends AbstractMINBean {
     public void setEquipmentId(String equipmentId) {
         this.equipmentId = equipmentId == null ? null : equipmentId.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_account.ACT_ISBRANCH
+     *
+     * @return the value of vm_account.ACT_ISBRANCH
+     *
+     * @mbggenerated
+     */
+    public String getIsbranch() {
+        return isbranch;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_account.ACT_ISBRANCH
+     *
+     * @param isbranch the value for vm_account.ACT_ISBRANCH
+     *
+     * @mbggenerated
+     */
+    public void setIsbranch(String isbranch) {
+        this.isbranch = isbranch == null ? null : isbranch.trim();
+    }
 }

+ 78 - 0
src/main/java/com/minpay/db/table/model/VmAccountExample.java

@@ -1281,6 +1281,84 @@ public class VmAccountExample {
             addCriterion("ACT_EQUIPMENT_ID not between", value1, value2, "equipmentId");
             return (Criteria) this;
         }
+
+        public Criteria andIsbranchIsNull() {
+            addCriterion("ACT_ISBRANCH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchIsNotNull() {
+            addCriterion("ACT_ISBRANCH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchEqualTo(String value) {
+            if(value == null ){
+                andIsbranchIsNull();
+            } else {
+                addCriterion("ACT_ISBRANCH =", value, "isbranch");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchNotEqualTo(String value) {
+            if(value == null ){
+                andIsbranchIsNotNull();
+            } else {
+                addCriterion("ACT_ISBRANCH <>", value, "isbranch");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchGreaterThan(String value) {
+            addCriterion("ACT_ISBRANCH >", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchGreaterThanOrEqualTo(String value) {
+            addCriterion("ACT_ISBRANCH >=", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchLessThan(String value) {
+            addCriterion("ACT_ISBRANCH <", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchLessThanOrEqualTo(String value) {
+            addCriterion("ACT_ISBRANCH <=", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchLike(String value) {
+            addCriterion("ACT_ISBRANCH like", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchNotLike(String value) {
+            addCriterion("ACT_ISBRANCH not like", value, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchIn(List<String> values) {
+            addCriterion("ACT_ISBRANCH in", values, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchNotIn(List<String> values) {
+            addCriterion("ACT_ISBRANCH not in", values, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchBetween(String value1, String value2) {
+            addCriterion("ACT_ISBRANCH between", value1, value2, "isbranch");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsbranchNotBetween(String value1, String value2) {
+            addCriterion("ACT_ISBRANCH not between", value1, value2, "isbranch");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -220,6 +220,14 @@ public class VmOrderInf extends AbstractMINBean {
     private String gameRule;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_inf.VOI_RECHARE_RULE_ID
+     *
+     * @mbggenerated
+     */
+    private String rechareRuleId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_inf.VOI_ID
      *
@@ -866,4 +874,28 @@ public class VmOrderInf extends AbstractMINBean {
     public void setGameRule(String gameRule) {
         this.gameRule = gameRule == null ? null : gameRule.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_inf.VOI_RECHARE_RULE_ID
+     *
+     * @return the value of vm_order_inf.VOI_RECHARE_RULE_ID
+     *
+     * @mbggenerated
+     */
+    public String getRechareRuleId() {
+        return rechareRuleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_inf.VOI_RECHARE_RULE_ID
+     *
+     * @param rechareRuleId the value for vm_order_inf.VOI_RECHARE_RULE_ID
+     *
+     * @mbggenerated
+     */
+    public void setRechareRuleId(String rechareRuleId) {
+        this.rechareRuleId = rechareRuleId == null ? null : rechareRuleId.trim();
+    }
 }

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

@@ -2295,6 +2295,84 @@ public class VmOrderInfExample {
             addCriterion("VOI_GAME_RULE not between", value1, value2, "gameRule");
             return (Criteria) this;
         }
+
+        public Criteria andRechareRuleIdIsNull() {
+            addCriterion("VOI_RECHARE_RULE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdIsNotNull() {
+            addCriterion("VOI_RECHARE_RULE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdEqualTo(String value) {
+            if(value == null ){
+                andRechareRuleIdIsNull();
+            } else {
+                addCriterion("VOI_RECHARE_RULE_ID =", value, "rechareRuleId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdNotEqualTo(String value) {
+            if(value == null ){
+                andRechareRuleIdIsNotNull();
+            } else {
+                addCriterion("VOI_RECHARE_RULE_ID <>", value, "rechareRuleId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdGreaterThan(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID >", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID >=", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdLessThan(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID <", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdLessThanOrEqualTo(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID <=", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdLike(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID like", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdNotLike(String value) {
+            addCriterion("VOI_RECHARE_RULE_ID not like", value, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdIn(List<String> values) {
+            addCriterion("VOI_RECHARE_RULE_ID in", values, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdNotIn(List<String> values) {
+            addCriterion("VOI_RECHARE_RULE_ID not in", values, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdBetween(String value1, String value2) {
+            addCriterion("VOI_RECHARE_RULE_ID between", value1, value2, "rechareRuleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRechareRuleIdNotBetween(String value1, String value2) {
+            addCriterion("VOI_RECHARE_RULE_ID not between", value1, value2, "rechareRuleId");
+            return (Criteria) this;
+        }
     }
 
     /**

+ 11 - 2
src/main/java/com/minpay/shouhuo/orderaction/PayManageAction.java

@@ -67,6 +67,13 @@ public class PayManageAction implements IMINAction {
 			MINHttpServletRequestContext fapRequest
 	) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
+		/**查询机器*/
+		//校验机器编号是否存在
+		VmEquipmentInf vmEquipmentInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmEquipmentInfMapper.class).selectByPrimaryKey(equipmentId);
+		if(vmEquipmentInf == null){
+			throw new MINBusinessException("机器不存在或异常!");
+		}
+
 
 		//获取操作员
 		User user = session.getUser();
@@ -100,7 +107,7 @@ public class PayManageAction implements IMINAction {
 		ordInf.setPersonId(user.getId());				//下单人编号
 		ordInf.setEquipmentId(equipmentId);		//虚拟售货机号
 		ordInf.setState("91");						//91未支付
-		ordInf.setRemarks("会员充值(加赠送金额):" + rechargeAmt);		//备注
+		ordInf.setRemarks("会员充值(加赠送金额):" + rechargeAmt +"赠送金额:"+giveAmt);		//备注
 		ordInf.setIsDraw("00");						//是否中奖:00未中奖01中奖
 		ordInf.setIsUsed("00");						//是否使用:00已使用01未使用
 		ordInf.setProType("02");					//00正常商品,01抽奖商品,02:充值
@@ -111,9 +118,11 @@ public class PayManageAction implements IMINAction {
 		ordInf.setModifyTime(DateUtil.getCurrentDateTimeString());				//修改时间
 		ordInf.setOrderAmt(rechargeAmt);		//订单总金额
 		ordInf.setPickupStt("00");
+		ordInf.setBranchid(vmEquipmentInf.getBranchid());
+		ordInf.setRechareRuleId(ruleId);
 		// 执行新增订单数据
 		Service.lookup(IMINDataBaseService.class)
-				.getMybatisMapper(VmOrderInfMapper.class).insert(ordInf);
+				.getMybatisMapper(VmOrderInfMapper.class).insertSelective(ordInf);
 
 		//记录充值流水表
 		String flowno = Service.lookup(IPublicService.class).getSequence("VM_PAYMENT_INF_ID");

+ 23 - 5
src/main/resources/com/minpay/db/table/mapper/VmAccountMapper.xml

@@ -20,6 +20,7 @@
     <result column="ACT_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
     <result column="ACT_STATE" jdbcType="VARCHAR" property="state" />
     <result column="ACT_EQUIPMENT_ID" jdbcType="VARCHAR" property="equipmentId" />
+    <result column="ACT_ISBRANCH" jdbcType="VARCHAR" property="isbranch" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -93,7 +94,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     ACT_ID, ACT_CHANNEL, ACT_USRID, ACT_TYPE, ACT_NAME, ACT_NUMBER, ACT_AMT, ACT_AVA_AMT, 
-    ACT_CREATE_USER, ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME, ACT_STATE, ACT_EQUIPMENT_ID
+    ACT_CREATE_USER, ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME, ACT_STATE, ACT_EQUIPMENT_ID, 
+    ACT_ISBRANCH
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmAccountExample" resultMap="BaseResultMap">
     <!--
@@ -150,12 +152,14 @@
       ACT_TYPE, ACT_NAME, ACT_NUMBER, 
       ACT_AMT, ACT_AVA_AMT, ACT_CREATE_USER, 
       ACT_CREATE_TIME, ACT_MODIFY_USER, ACT_MODIFY_TIME, 
-      ACT_STATE, ACT_EQUIPMENT_ID)
+      ACT_STATE, ACT_EQUIPMENT_ID, ACT_ISBRANCH
+      )
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{usrid,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
       #{amt,jdbcType=VARCHAR}, #{avaAmt,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
-      #{state,jdbcType=VARCHAR}, #{equipmentId,jdbcType=VARCHAR})
+      #{state,jdbcType=VARCHAR}, #{equipmentId,jdbcType=VARCHAR}, #{isbranch,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmAccount">
     <!--
@@ -206,6 +210,9 @@
       <if test="equipmentId != null">
         ACT_EQUIPMENT_ID,
       </if>
+      <if test="isbranch != null">
+        ACT_ISBRANCH,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -250,6 +257,9 @@
       <if test="equipmentId != null">
         #{equipmentId,jdbcType=VARCHAR},
       </if>
+      <if test="isbranch != null">
+        #{isbranch,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmAccountExample" resultType="java.lang.Integer">
@@ -311,6 +321,9 @@
       <if test="record.equipmentId != null">
         ACT_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR},
       </if>
+      <if test="record.isbranch != null">
+        ACT_ISBRANCH = #{record.isbranch,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -335,7 +348,8 @@
       ACT_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       ACT_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       ACT_STATE = #{record.state,jdbcType=VARCHAR},
-      ACT_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR}
+      ACT_EQUIPMENT_ID = #{record.equipmentId,jdbcType=VARCHAR},
+      ACT_ISBRANCH = #{record.isbranch,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -386,6 +400,9 @@
       <if test="equipmentId != null">
         ACT_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR},
       </if>
+      <if test="isbranch != null">
+        ACT_ISBRANCH = #{isbranch,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -407,7 +424,8 @@
       ACT_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       ACT_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       ACT_STATE = #{state,jdbcType=VARCHAR},
-      ACT_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR}
+      ACT_EQUIPMENT_ID = #{equipmentId,jdbcType=VARCHAR},
+      ACT_ISBRANCH = #{isbranch,jdbcType=VARCHAR}
     where ACT_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 22 - 7
src/main/resources/com/minpay/db/table/mapper/VmOrderInfMapper.xml

@@ -33,6 +33,7 @@
     <result column="VOI_PAY_MODE" jdbcType="VARCHAR" property="payMode" />
     <result column="VOI_OPERATION" jdbcType="VARCHAR" property="operation" />
     <result column="VOI_GAME_RULE" jdbcType="VARCHAR" property="gameRule" />
+    <result column="VOI_RECHARE_RULE_ID" jdbcType="VARCHAR" property="rechareRuleId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -109,7 +110,7 @@
     VOI_PAY_ORDERNO, VOI_REMARKS, VOI_PAY_TYPE, VOI_NUMBER, VOI_PRO_TYPE, VOI_IS_DRAW, 
     VOI_IS_USED, VOI_PRO_STATE, VOI_DRAW_PRICE, VOI_CREATE_USER, VOI_CREATE_TIME, VOI_MODIFY_USER, 
     VOI_MODIFY_TIME, VOI_PICKUP_NO, VOI_PICKUP_STT, VOI_PICKUP_TIME, VOI_BRANCHID, VOI_PAY_MODE, 
-    VOI_OPERATION, VOI_GAME_RULE
+    VOI_OPERATION, VOI_GAME_RULE, VOI_RECHARE_RULE_ID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderInfExample" resultMap="BaseResultMap">
     <!--
@@ -170,8 +171,8 @@
       VOI_DRAW_PRICE, VOI_CREATE_USER, VOI_CREATE_TIME, 
       VOI_MODIFY_USER, VOI_MODIFY_TIME, VOI_PICKUP_NO, 
       VOI_PICKUP_STT, VOI_PICKUP_TIME, VOI_BRANCHID, 
-      VOI_PAY_MODE, VOI_OPERATION, VOI_GAME_RULE
-      )
+      VOI_PAY_MODE, VOI_OPERATION, VOI_GAME_RULE, 
+      VOI_RECHARE_RULE_ID)
     values (#{id,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{personId,jdbcType=VARCHAR}, 
       #{equipmentId,jdbcType=VARCHAR}, #{orderAmt,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
       #{recordId,jdbcType=VARCHAR}, #{payOrderno,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
@@ -180,8 +181,8 @@
       #{drawPrice,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
       #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, #{pickupNo,jdbcType=VARCHAR}, 
       #{pickupStt,jdbcType=VARCHAR}, #{pickupTime,jdbcType=VARCHAR}, #{branchid,jdbcType=VARCHAR}, 
-      #{payMode,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR}, #{gameRule,jdbcType=VARCHAR}
-      )
+      #{payMode,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR}, #{gameRule,jdbcType=VARCHAR}, 
+      #{rechareRuleId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderInf">
     <!--
@@ -271,6 +272,9 @@
       <if test="gameRule != null">
         VOI_GAME_RULE,
       </if>
+      <if test="rechareRuleId != null">
+        VOI_RECHARE_RULE_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -354,6 +358,9 @@
       <if test="gameRule != null">
         #{gameRule,jdbcType=VARCHAR},
       </if>
+      <if test="rechareRuleId != null">
+        #{rechareRuleId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderInfExample" resultType="java.lang.Integer">
@@ -454,6 +461,9 @@
       <if test="record.gameRule != null">
         VOI_GAME_RULE = #{record.gameRule,jdbcType=VARCHAR},
       </if>
+      <if test="record.rechareRuleId != null">
+        VOI_RECHARE_RULE_ID = #{record.rechareRuleId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -491,7 +501,8 @@
       VOI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{record.payMode,jdbcType=VARCHAR},
       VOI_OPERATION = #{record.operation,jdbcType=VARCHAR},
-      VOI_GAME_RULE = #{record.gameRule,jdbcType=VARCHAR}
+      VOI_GAME_RULE = #{record.gameRule,jdbcType=VARCHAR},
+      VOI_RECHARE_RULE_ID = #{record.rechareRuleId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -581,6 +592,9 @@
       <if test="gameRule != null">
         VOI_GAME_RULE = #{gameRule,jdbcType=VARCHAR},
       </if>
+      <if test="rechareRuleId != null">
+        VOI_RECHARE_RULE_ID = #{rechareRuleId,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOI_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -615,7 +629,8 @@
       VOI_BRANCHID = #{branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR},
       VOI_OPERATION = #{operation,jdbcType=VARCHAR},
-      VOI_GAME_RULE = #{gameRule,jdbcType=VARCHAR}
+      VOI_GAME_RULE = #{gameRule,jdbcType=VARCHAR},
+      VOI_RECHARE_RULE_ID = #{rechareRuleId,jdbcType=VARCHAR}
     where VOI_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>