售货机 推货和推送

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

@@ -234,13 +234,14 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmProEquRelMapper.class)
 						.updateByPrimaryKeySelective(vpe);
-				// 增加提货数量 + 1
+				// 增加提货数量 + 1D:\
 				String deliveryNums = CommonUtil.add(vdi.getDeliveryNums(), "1");
 				vdi.setDeliveryNums(deliveryNums);
 				if(deliveryNums.equals(vdi.getProNums())){//都提完了
 					VmOrderDetails vmOrderDetails = new VmOrderDetails();
 					vmOrderDetails.setDetailsId(orddetid);
 					vmOrderDetails.setIsDelivery("01");
+					vmOrderDetails.setPickupTime(DateUtil.getCurrentDateTimeString());
 					Service.lookup(IMINDataBaseService.class)
 							.getMybatisMapper(VmOrderDetailsMapper.class)
 							.updateByPrimaryKeySelective(vmOrderDetails);

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

@@ -164,6 +164,14 @@ public class VmOrderDetails extends AbstractMINBean {
     private String isDelivery;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_PICKUP_TIME
+     *
+     * @mbggenerated
+     */
+    private String pickupTime;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_DETAILS_ID
      *
@@ -642,4 +650,28 @@ public class VmOrderDetails extends AbstractMINBean {
     public void setIsDelivery(String isDelivery) {
         this.isDelivery = isDelivery == null ? null : isDelivery.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_PICKUP_TIME
+     *
+     * @return the value of vm_order_details.VOD_PICKUP_TIME
+     *
+     * @mbggenerated
+     */
+    public String getPickupTime() {
+        return pickupTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_PICKUP_TIME
+     *
+     * @param pickupTime the value for vm_order_details.VOD_PICKUP_TIME
+     *
+     * @mbggenerated
+     */
+    public void setPickupTime(String pickupTime) {
+        this.pickupTime = pickupTime == null ? null : pickupTime.trim();
+    }
 }

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

@@ -1749,6 +1749,84 @@ public class VmOrderDetailsExample {
             addCriterion("VOD_IS_DELIVERY not between", value1, value2, "isDelivery");
             return (Criteria) this;
         }
+
+        public Criteria andPickupTimeIsNull() {
+            addCriterion("VOD_PICKUP_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeIsNotNull() {
+            addCriterion("VOD_PICKUP_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeEqualTo(String value) {
+            if(value == null ){
+                andPickupTimeIsNull();
+            } else {
+                addCriterion("VOD_PICKUP_TIME =", value, "pickupTime");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeNotEqualTo(String value) {
+            if(value == null ){
+                andPickupTimeIsNotNull();
+            } else {
+                addCriterion("VOD_PICKUP_TIME <>", value, "pickupTime");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeGreaterThan(String value) {
+            addCriterion("VOD_PICKUP_TIME >", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_PICKUP_TIME >=", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeLessThan(String value) {
+            addCriterion("VOD_PICKUP_TIME <", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeLessThanOrEqualTo(String value) {
+            addCriterion("VOD_PICKUP_TIME <=", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeLike(String value) {
+            addCriterion("VOD_PICKUP_TIME like", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeNotLike(String value) {
+            addCriterion("VOD_PICKUP_TIME not like", value, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeIn(List<String> values) {
+            addCriterion("VOD_PICKUP_TIME in", values, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeNotIn(List<String> values) {
+            addCriterion("VOD_PICKUP_TIME not in", values, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeBetween(String value1, String value2) {
+            addCriterion("VOD_PICKUP_TIME between", value1, value2, "pickupTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickupTimeNotBetween(String value1, String value2) {
+            addCriterion("VOD_PICKUP_TIME not between", value1, value2, "pickupTime");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -26,6 +26,7 @@
     <result column="VOD_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
     <result column="VOD_DELIVERY_ID" jdbcType="VARCHAR" property="deliveryId" />
     <result column="VOD_IS_DELIVERY" jdbcType="VARCHAR" property="isDelivery" />
+    <result column="VOD_PICKUP_TIME" jdbcType="VARCHAR" property="pickupTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -101,7 +102,7 @@
     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_IS_WINNING, VOD_CREATE_USER, VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
-    VOD_DELIVERY_ID, VOD_IS_DELIVERY
+    VOD_DELIVERY_ID, VOD_IS_DELIVERY, VOD_PICKUP_TIME
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -160,14 +161,16 @@
       VOD_PRO_NUMS, VOD_AMOUNT, VOD_RECORD_ID, 
       VOD_REMARKS, VOD_IS_WINNING, VOD_CREATE_USER, 
       VOD_CREATE_TIME, VOD_MODIFY_USER, VOD_MODIFY_TIME, 
-      VOD_DELIVERY_ID, VOD_IS_DELIVERY)
+      VOD_DELIVERY_ID, VOD_IS_DELIVERY, VOD_PICKUP_TIME
+      )
     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}, #{isWinning,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
-      #{deliveryId,jdbcType=VARCHAR}, #{isDelivery,jdbcType=VARCHAR})
+      #{deliveryId,jdbcType=VARCHAR}, #{isDelivery,jdbcType=VARCHAR}, #{pickupTime,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderDetails">
     <!--
@@ -236,6 +239,9 @@
       <if test="isDelivery != null">
         VOD_IS_DELIVERY,
       </if>
+      <if test="pickupTime != null">
+        VOD_PICKUP_TIME,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="detailsId != null">
@@ -298,6 +304,9 @@
       <if test="isDelivery != null">
         #{isDelivery,jdbcType=VARCHAR},
       </if>
+      <if test="pickupTime != null">
+        #{pickupTime,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultType="java.lang.Integer">
@@ -377,6 +386,9 @@
       <if test="record.isDelivery != null">
         VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR},
       </if>
+      <if test="record.pickupTime != null">
+        VOD_PICKUP_TIME = #{record.pickupTime,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -407,7 +419,8 @@
       VOD_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
-      VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR}
+      VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR},
+      VOD_PICKUP_TIME = #{record.pickupTime,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -476,6 +489,9 @@
       <if test="isDelivery != null">
         VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR},
       </if>
+      <if test="pickupTime != null">
+        VOD_PICKUP_TIME = #{pickupTime,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
@@ -503,7 +519,8 @@
       VOD_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
-      VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR}
+      VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR},
+      VOD_PICKUP_TIME = #{pickupTime,jdbcType=VARCHAR}
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
 </mapper>