Ver Fonte

中奖规则

xubh há 5 anos atrás
pai
commit
80e5befead

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

@@ -57,6 +57,7 @@ public class DrawAction implements IMINAction {
 			@MINParam(key = "payNumber") String payNumber,
 			@MINParam(key = "multipleAmt") String multipleAmt,
 			@MINParam(key = "multipleRate") String multipleRate,
+			@MINParam(key = "gameRule") String gameRule,
 			MINSession session) throws MINBusinessException {
 		MINActionResult res = new MINActionResult();
 		
@@ -100,7 +101,7 @@ public class DrawAction implements IMINAction {
 		obj.put("proNums", "1");
 		jsonArr.add(obj);
 		// 生成订单,返回订单ID
-		String orderId = Service.lookup(IOrderService.class).createOrderInf(proInf.getEquipmentId(), "01", proState, payType, payNumber, jsonArr.toString(), session);
+		String orderId = Service.lookup(IOrderService.class).createOrderInf(proInf.getEquipmentId(), "01", proState, payType, payNumber, jsonArr.toString(), session,gameRule);
 		//调用支付流水生产接口
 		if(!CommonUtil.isEmpty(orderId)){
 			String totalAmt = PaymentAction.addPaymentInfo(orderId, session);

+ 64 - 0
src/main/java/com/minpay/db/table/model/VmOrderDetails.java

@@ -109,6 +109,14 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    private String isWinning;
+
+    /**
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column vm_order_details.VOD_CREATE_USER
      *
      * @mbggenerated
@@ -140,6 +148,14 @@ public class VmOrderDetails extends AbstractMINBean {
     private String modifyTime;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    private String deliveryId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_DETAILS_ID
      *
@@ -453,6 +469,30 @@ public class VmOrderDetails extends AbstractMINBean {
 
     /**
      * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @return the value of vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    public String getIsWinning() {
+        return isWinning;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_IS_WINNING
+     *
+     * @param isWinning the value for vm_order_details.VOD_IS_WINNING
+     *
+     * @mbggenerated
+     */
+    public void setIsWinning(String isWinning) {
+        this.isWinning = isWinning == null ? null : isWinning.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_CREATE_USER
      *
      * @return the value of vm_order_details.VOD_CREATE_USER
@@ -546,4 +586,28 @@ public class VmOrderDetails extends AbstractMINBean {
     public void setModifyTime(String modifyTime) {
         this.modifyTime = modifyTime == null ? null : modifyTime.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @return the value of vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public String getDeliveryId() {
+        return deliveryId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_DELIVERY_ID
+     *
+     * @param deliveryId the value for vm_order_details.VOD_DELIVERY_ID
+     *
+     * @mbggenerated
+     */
+    public void setDeliveryId(String deliveryId) {
+        this.deliveryId = deliveryId == null ? null : deliveryId.trim();
+    }
 }

+ 156 - 0
src/main/java/com/minpay/db/table/model/VmOrderDetailsExample.java

@@ -1204,6 +1204,84 @@ public class VmOrderDetailsExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsWinningIsNull() {
+            addCriterion("VOD_IS_WINNING is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningIsNotNull() {
+            addCriterion("VOD_IS_WINNING is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningEqualTo(String value) {
+            if(value == null ){
+                andIsWinningIsNull();
+            } else {
+                addCriterion("VOD_IS_WINNING =", value, "isWinning");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotEqualTo(String value) {
+            if(value == null ){
+                andIsWinningIsNotNull();
+            } else {
+                addCriterion("VOD_IS_WINNING <>", value, "isWinning");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningGreaterThan(String value) {
+            addCriterion("VOD_IS_WINNING >", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_WINNING >=", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLessThan(String value) {
+            addCriterion("VOD_IS_WINNING <", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLessThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_WINNING <=", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningLike(String value) {
+            addCriterion("VOD_IS_WINNING like", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotLike(String value) {
+            addCriterion("VOD_IS_WINNING not like", value, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningIn(List<String> values) {
+            addCriterion("VOD_IS_WINNING in", values, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotIn(List<String> values) {
+            addCriterion("VOD_IS_WINNING not in", values, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningBetween(String value1, String value2) {
+            addCriterion("VOD_IS_WINNING between", value1, value2, "isWinning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsWinningNotBetween(String value1, String value2) {
+            addCriterion("VOD_IS_WINNING not between", value1, value2, "isWinning");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIsNull() {
             addCriterion("VOD_CREATE_USER is null");
             return (Criteria) this;
@@ -1515,6 +1593,84 @@ public class VmOrderDetailsExample {
             addCriterion("VOD_MODIFY_TIME not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andDeliveryIdIsNull() {
+            addCriterion("VOD_DELIVERY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdIsNotNull() {
+            addCriterion("VOD_DELIVERY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdEqualTo(String value) {
+            if(value == null ){
+                andDeliveryIdIsNull();
+            } else {
+                addCriterion("VOD_DELIVERY_ID =", value, "deliveryId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotEqualTo(String value) {
+            if(value == null ){
+                andDeliveryIdIsNotNull();
+            } else {
+                addCriterion("VOD_DELIVERY_ID <>", value, "deliveryId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdGreaterThan(String value) {
+            addCriterion("VOD_DELIVERY_ID >", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_DELIVERY_ID >=", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLessThan(String value) {
+            addCriterion("VOD_DELIVERY_ID <", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLessThanOrEqualTo(String value) {
+            addCriterion("VOD_DELIVERY_ID <=", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdLike(String value) {
+            addCriterion("VOD_DELIVERY_ID like", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotLike(String value) {
+            addCriterion("VOD_DELIVERY_ID not like", value, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdIn(List<String> values) {
+            addCriterion("VOD_DELIVERY_ID in", values, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotIn(List<String> values) {
+            addCriterion("VOD_DELIVERY_ID not in", values, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdBetween(String value1, String value2) {
+            addCriterion("VOD_DELIVERY_ID between", value1, value2, "deliveryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryIdNotBetween(String value1, String value2) {
+            addCriterion("VOD_DELIVERY_ID not between", value1, value2, "deliveryId");
+            return (Criteria) this;
+        }
     }
 
     /**

+ 1 - 0
src/main/java/com/minpay/shouhuo/deliveryaction/DeliveryAction.java

@@ -416,6 +416,7 @@ public class DeliveryAction implements IMINAction{
 						.insertSelective(dlInf);
 				//更新订单详情
 				if(ordInf.getIsDraw().equals("00")){
+					detInf.setDeliveryId(dlId);
 					ordInf.setIsDraw("01");
 					Service.lookup(IMINDataBaseService.class)
 							.getMybatisMapper(VmOrderDetailsMapper.class)

+ 40 - 7
src/main/resources/com/minpay/db/table/mapper/VmOrderDetailsMapper.xml

@@ -19,10 +19,12 @@
     <result column="VOD_AMOUNT" jdbcType="VARCHAR" property="amount" />
     <result column="VOD_RECORD_ID" jdbcType="VARCHAR" property="recordId" />
     <result column="VOD_REMARKS" jdbcType="VARCHAR" property="remarks" />
+    <result column="VOD_IS_WINNING" jdbcType="VARCHAR" property="isWinning" />
     <result column="VOD_CREATE_USER" jdbcType="VARCHAR" property="createUser" />
     <result column="VOD_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
     <result column="VOD_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
     <result column="VOD_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VOD_DELIVERY_ID" jdbcType="VARCHAR" property="deliveryId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -97,7 +99,8 @@
     -->
     VOD_DETAILS_ID, VOD_CHANNEL, VOD_ORDER_ID, VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
     VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
-    VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME
+    VOD_REMARKS, VOD_IS_WINNING, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
+    VOD_DELIVERY_ID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -154,14 +157,16 @@
       VOD_PRO_EQU_REL_ID, VOD_CARGO_WAY, VOD_PRODUCT_ID, 
       VOD_PRO_TYPE, VOD_PRO_NAME, VOD_PRO_PRICE, 
       VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
-      VOD_REMARKS, VOD_CREATE_USER, VOD_CREATE_TIME, 
-      VOD_MODIFY_USER, VOD_MODIFY_TIME)
+      VOD_REMARKS, VOD_IS_WINNING, VOD_CREATE_USER, 
+      VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
+      VOD_DELIVERY_ID)
     values (#{detailsId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{orderId,jdbcType=VARCHAR}, 
       #{proEquRelId,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, #{productId,jdbcType=VARCHAR}, 
       #{proType,jdbcType=VARCHAR}, #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, 
       #{proNums,jdbcType=VARCHAR}, #{amount,jdbcType=VARCHAR}, #{recordId,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
-      #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR})
+      #{remarks,jdbcType=VARCHAR}, #{isWinning,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{deliveryId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderDetails">
     <!--
@@ -209,6 +214,9 @@
       <if test="remarks != null">
         VOD_REMARKS,
       </if>
+      <if test="isWinning != null">
+        VOD_IS_WINNING,
+      </if>
       <if test="createUser != null">
         VOD_CREATE_USER,
       </if>
@@ -221,6 +229,9 @@
       <if test="modifyTime != null">
         VOD_MODIFY_TIME,
       </if>
+      <if test="deliveryId != null">
+        VOD_DELIVERY_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="detailsId != null">
@@ -262,6 +273,9 @@
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="isWinning != null">
+        #{isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
@@ -274,6 +288,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="deliveryId != null">
+        #{deliveryId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultType="java.lang.Integer">
@@ -332,6 +349,9 @@
       <if test="record.remarks != null">
         VOD_REMARKS = #{record.remarks,jdbcType=VARCHAR},
       </if>
+      <if test="record.isWinning != null">
+        VOD_IS_WINNING = #{record.isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="record.createUser != null">
         VOD_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       </if>
@@ -344,6 +364,9 @@
       <if test="record.modifyTime != null">
         VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.deliveryId != null">
+        VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -368,10 +391,12 @@
       VOD_AMOUNT = #{record.amount,jdbcType=VARCHAR},
       VOD_RECORD_ID = #{record.recordId,jdbcType=VARCHAR},
       VOD_REMARKS = #{record.remarks,jdbcType=VARCHAR},
+      VOD_IS_WINNING = #{record.isWinning,jdbcType=VARCHAR},
       VOD_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       VOD_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
-      VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
+      VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -419,6 +444,9 @@
       <if test="remarks != null">
         VOD_REMARKS = #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="isWinning != null">
+        VOD_IS_WINNING = #{isWinning,jdbcType=VARCHAR},
+      </if>
       <if test="createUser != null">
         VOD_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       </if>
@@ -431,6 +459,9 @@
       <if test="modifyTime != null">
         VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="deliveryId != null">
+        VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
@@ -452,10 +483,12 @@
       VOD_AMOUNT = #{amount,jdbcType=VARCHAR},
       VOD_RECORD_ID = #{recordId,jdbcType=VARCHAR},
       VOD_REMARKS = #{remarks,jdbcType=VARCHAR},
+      VOD_IS_WINNING = #{isWinning,jdbcType=VARCHAR},
       VOD_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       VOD_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
-      VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR}
+      VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
 </mapper>