下单

src/main/java/com/minpay/common/service/IOrderService.java

@@ -16,5 +16,5 @@ public interface IOrderService extends IMINLocalService, IMINInitializer {
 	 * @return
 	 * @throws MINBusinessException
 	 */
-	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session) throws MINBusinessException;
+	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameId) throws MINBusinessException;
 }

src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -38,7 +38,7 @@ public class OrderServiceImpl implements IOrderService {
 	}
 
 	@Override
-	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session) throws MINBusinessException {
+	public String createOrderInf(String equNo, String proType, String proState, String payType, String payNumber, String detData, MINSession session,String gameId) throws MINBusinessException {
 		VmPersonInf newPerson = new VmPersonInf();
 		//获取操作员
 		User user = session.getUser();
@@ -82,6 +82,7 @@ public class OrderServiceImpl implements IOrderService {
 		ordInf.setModifyUser(user.getId());			//修改人
 		ordInf.setModifyTime(nowTime);				//修改时间
         ordInf.setBranchid(equInf.getBranchid());
+		ordInf.setGameId(gameId);
 		//定义订单总金额
 		String orderAmt = "0.00";
 		//定义订单详情初始化详情编号的flag

src/main/java/com/minpay/db/table/model/VmOrderInf.java

@@ -212,6 +212,14 @@ public class VmOrderInf extends AbstractMINBean {
     private String operation;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_inf.VOI_GAME_ID
+     *
+     * @mbggenerated
+     */
+    private String gameId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_inf.VOI_ID
      *
@@ -834,4 +842,28 @@ public class VmOrderInf extends AbstractMINBean {
     public void setOperation(String operation) {
         this.operation = operation == null ? null : operation.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_inf.VOI_GAME_ID
+     *
+     * @return the value of vm_order_inf.VOI_GAME_ID
+     *
+     * @mbggenerated
+     */
+    public String getGameId() {
+        return gameId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_inf.VOI_GAME_ID
+     *
+     * @param gameId the value for vm_order_inf.VOI_GAME_ID
+     *
+     * @mbggenerated
+     */
+    public void setGameId(String gameId) {
+        this.gameId = gameId == null ? null : gameId.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmOrderInfExample.java

@@ -2217,6 +2217,84 @@ public class VmOrderInfExample {
             addCriterion("VOI_OPERATION not between", value1, value2, "operation");
             return (Criteria) this;
         }
+
+        public Criteria andGameIdIsNull() {
+            addCriterion("VOI_GAME_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdIsNotNull() {
+            addCriterion("VOI_GAME_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdEqualTo(String value) {
+            if(value == null ){
+                andGameIdIsNull();
+            } else {
+                addCriterion("VOI_GAME_ID =", value, "gameId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdNotEqualTo(String value) {
+            if(value == null ){
+                andGameIdIsNotNull();
+            } else {
+                addCriterion("VOI_GAME_ID <>", value, "gameId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdGreaterThan(String value) {
+            addCriterion("VOI_GAME_ID >", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VOI_GAME_ID >=", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdLessThan(String value) {
+            addCriterion("VOI_GAME_ID <", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdLessThanOrEqualTo(String value) {
+            addCriterion("VOI_GAME_ID <=", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdLike(String value) {
+            addCriterion("VOI_GAME_ID like", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdNotLike(String value) {
+            addCriterion("VOI_GAME_ID not like", value, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdIn(List<String> values) {
+            addCriterion("VOI_GAME_ID in", values, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdNotIn(List<String> values) {
+            addCriterion("VOI_GAME_ID not in", values, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdBetween(String value1, String value2) {
+            addCriterion("VOI_GAME_ID between", value1, value2, "gameId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGameIdNotBetween(String value1, String value2) {
+            addCriterion("VOI_GAME_ID not between", value1, value2, "gameId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/shouhuo/orderaction/ShOrderManageAction.java

@@ -137,6 +137,7 @@ public class ShOrderManageAction implements IMINAction {
 			@MINParam(key = "proState")String proState,
 			@MINParam(key = "detData")String detData,
 			@MINParam(key = "payType")String payType,
+			@MINParam(key = "gameId")String gameId,
 			MINSession session) throws MINBusinessException{
 		//创建返回值对象
 		MINActionResult res = new MINActionResult();
@@ -145,7 +146,7 @@ public class ShOrderManageAction implements IMINAction {
 		}
 		//解密售货机编号
 		//String equNoNew = OffSetUtil.deScanCode(equNo);
-		String orderId = Service.lookup(IOrderService.class).createOrderInf(equNo, proType, proState, payType, "", detData, session);
+		String orderId = Service.lookup(IOrderService.class).createOrderInf(equNo, proType, proState, payType, "", detData, session,gameId);
 		//调用支付流水生产接口
 		if(!CommonUtil.isEmpty(orderId)){
 			String totalAmt = PaymentAction.addPaymentInfo(orderId, session);

src/main/java/com/minpay/shouhuo/paymentaction/PaymentAction.java

@@ -148,7 +148,7 @@ public class PaymentAction implements IMINAction{
 		if(list != null && list.size() > 0){
 			proType = list.get(0).getProType();	
 		}
-		VmClearingRulesExample examp = new VmClearingRulesExample();
+		/*VmClearingRulesExample examp = new VmClearingRulesExample();
 		examp.createCriteria().andChannelEqualTo(user.getChannel()).andUserIdEqualTo(recCstNo).andTypeEqualTo(proType);
 		List<VmClearingRules> ruleList = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(VmClearingRulesMapper.class)
@@ -161,7 +161,7 @@ public class PaymentAction implements IMINAction{
 							.selectByPrimaryKey(clearNo);
 		} else {
 			ruleInf = ruleList.get(0);
-		}
+		}*/
 		// 支付流水表--商户收款=订单金额-平台分润-代理分润
 		String flowno = Service.lookup(IPublicService.class).getSequence("VM_PAYMENT_INF_ID");
 		VmPaymentInf payInf = new VmPaymentInf();

src/main/resources/com/minpay/db/table/mapper/VmOrderInfMapper.xml

@@ -32,6 +32,7 @@
     <result column="VOI_BRANCHID" jdbcType="VARCHAR" property="branchid" />
     <result column="VOI_PAY_MODE" jdbcType="VARCHAR" property="payMode" />
     <result column="VOI_OPERATION" jdbcType="VARCHAR" property="operation" />
+    <result column="VOI_GAME_ID" jdbcType="VARCHAR" property="gameId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -108,7 +109,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_OPERATION, VOI_GAME_ID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderInfExample" resultMap="BaseResultMap">
     <!--
@@ -169,7 +170,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_PAY_MODE, VOI_OPERATION, VOI_GAME_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}, 
@@ -178,7 +180,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})
+      #{payMode,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR}, #{gameId,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderInf">
     <!--
@@ -265,6 +268,9 @@
       <if test="operation != null">
         VOI_OPERATION,
       </if>
+      <if test="gameId != null">
+        VOI_GAME_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -345,6 +351,9 @@
       <if test="operation != null">
         #{operation,jdbcType=VARCHAR},
       </if>
+      <if test="gameId != null">
+        #{gameId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderInfExample" resultType="java.lang.Integer">
@@ -442,6 +451,9 @@
       <if test="record.operation != null">
         VOI_OPERATION = #{record.operation,jdbcType=VARCHAR},
       </if>
+      <if test="record.gameId != null">
+        VOI_GAME_ID = #{record.gameId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -478,7 +490,8 @@
       VOI_PICKUP_TIME = #{record.pickupTime,jdbcType=VARCHAR},
       VOI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{record.payMode,jdbcType=VARCHAR},
-      VOI_OPERATION = #{record.operation,jdbcType=VARCHAR}
+      VOI_OPERATION = #{record.operation,jdbcType=VARCHAR},
+      VOI_GAME_ID = #{record.gameId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -565,6 +578,9 @@
       <if test="operation != null">
         VOI_OPERATION = #{operation,jdbcType=VARCHAR},
       </if>
+      <if test="gameId != null">
+        VOI_GAME_ID = #{gameId,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOI_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -598,7 +614,8 @@
       VOI_PICKUP_TIME = #{pickupTime,jdbcType=VARCHAR},
       VOI_BRANCHID = #{branchid,jdbcType=VARCHAR},
       VOI_PAY_MODE = #{payMode,jdbcType=VARCHAR},
-      VOI_OPERATION = #{operation,jdbcType=VARCHAR}
+      VOI_OPERATION = #{operation,jdbcType=VARCHAR},
+      VOI_GAME_ID = #{gameId,jdbcType=VARCHAR}
     where VOI_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>