提货回调处理

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

@@ -156,6 +156,14 @@ public class VmOrderDetails extends AbstractMINBean {
     private String deliveryId;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    private String isDelivery;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_order_details.VOD_DETAILS_ID
      *
@@ -610,4 +618,28 @@ public class VmOrderDetails extends AbstractMINBean {
     public void setDeliveryId(String deliveryId) {
         this.deliveryId = deliveryId == null ? null : deliveryId.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @return the value of vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    public String getIsDelivery() {
+        return isDelivery;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_order_details.VOD_IS_DELIVERY
+     *
+     * @param isDelivery the value for vm_order_details.VOD_IS_DELIVERY
+     *
+     * @mbggenerated
+     */
+    public void setIsDelivery(String isDelivery) {
+        this.isDelivery = isDelivery == null ? null : isDelivery.trim();
+    }
 }

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

@@ -1671,6 +1671,84 @@ public class VmOrderDetailsExample {
             addCriterion("VOD_DELIVERY_ID not between", value1, value2, "deliveryId");
             return (Criteria) this;
         }
+
+        public Criteria andIsDeliveryIsNull() {
+            addCriterion("VOD_IS_DELIVERY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryIsNotNull() {
+            addCriterion("VOD_IS_DELIVERY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryEqualTo(String value) {
+            if(value == null ){
+                andIsDeliveryIsNull();
+            } else {
+                addCriterion("VOD_IS_DELIVERY =", value, "isDelivery");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotEqualTo(String value) {
+            if(value == null ){
+                andIsDeliveryIsNotNull();
+            } else {
+                addCriterion("VOD_IS_DELIVERY <>", value, "isDelivery");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryGreaterThan(String value) {
+            addCriterion("VOD_IS_DELIVERY >", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryGreaterThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_DELIVERY >=", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLessThan(String value) {
+            addCriterion("VOD_IS_DELIVERY <", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLessThanOrEqualTo(String value) {
+            addCriterion("VOD_IS_DELIVERY <=", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryLike(String value) {
+            addCriterion("VOD_IS_DELIVERY like", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotLike(String value) {
+            addCriterion("VOD_IS_DELIVERY not like", value, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryIn(List<String> values) {
+            addCriterion("VOD_IS_DELIVERY in", values, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotIn(List<String> values) {
+            addCriterion("VOD_IS_DELIVERY not in", values, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryBetween(String value1, String value2) {
+            addCriterion("VOD_IS_DELIVERY between", value1, value2, "isDelivery");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeliveryNotBetween(String value1, String value2) {
+            addCriterion("VOD_IS_DELIVERY not between", value1, value2, "isDelivery");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/minpay/shouhuo/deliveryaction/DeliveryAction.java

@@ -312,8 +312,30 @@ public class DeliveryAction implements IMINAction{
 					.getMybatisMapper(VmProEquRelMapper.class)
 					.updateByPrimaryKeySelective(vmProEquRel);
 
-		}
+			VmOrderDetails vmOrderDetails = new VmOrderDetails();
+			vmOrderDetails.setDetailsId(delInf.getOrdDetId());
+			vmOrderDetails.setIsDelivery("01");
+			Service.lookup(IMINDataBaseService.class)
+					.getMybatisMapper(VmOrderDetailsMapper.class)
+					.updateByPrimaryKeySelective(vmOrderDetails);
+
+			//查询订单是否都提货
+			VmOrderDetailsExample  vmOrderDetailsExample = new VmOrderDetailsExample();
+			vmOrderDetailsExample.createCriteria().andOrderIdEqualTo(orderNo).andDeliveryIdIsNotNull().andIsDeliveryEqualTo("0");
+			List<VmOrderDetails> vmOrderDetailsList = Service.lookup(IMINDataBaseService.class)
+											.getMybatisMapper(VmOrderDetailsMapper.class)
+											.selectByExample(vmOrderDetailsExample);
+			if(vmOrderDetailsList.size() == 0){
+				VmOrderInf vmOrderInf = new VmOrderInf();
+				vmOrderInf.setId(orderNo);
+				vmOrderInf.setPickupStt("01");
+				Service.lookup(IMINDataBaseService.class)
+						.getMybatisMapper(VmOrderInfMapper.class)
+						.updateByPrimaryKeySelective(vmOrderInf);
+
+			}
 
+		}
 		return res;
 	}
 	
@@ -575,6 +597,7 @@ public class DeliveryAction implements IMINAction{
 				dlInf.setCreateTime(nowTime);				//创建时间
 				dlInf.setModifyUser(ordInf.getPersonId());	//修改人
 				dlInf.setModifyTime(nowTime);				//修改时间
+				dlInf.setProEquRelId(detInf.getProEquRelId());                    //货道编号
 				//执行新增提货信息
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmDeliveryInfMapper.class)

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

@@ -25,6 +25,7 @@
     <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" />
+    <result column="VOD_IS_DELIVERY" jdbcType="VARCHAR" property="isDelivery" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -100,7 +101,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_DELIVERY_ID, VOD_IS_DELIVERY
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultMap="BaseResultMap">
     <!--
@@ -159,14 +160,14 @@
       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_DELIVERY_ID, VOD_IS_DELIVERY)
     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})
+      #{deliveryId,jdbcType=VARCHAR}, #{isDelivery,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmOrderDetails">
     <!--
@@ -232,6 +233,9 @@
       <if test="deliveryId != null">
         VOD_DELIVERY_ID,
       </if>
+      <if test="isDelivery != null">
+        VOD_IS_DELIVERY,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="detailsId != null">
@@ -291,6 +295,9 @@
       <if test="deliveryId != null">
         #{deliveryId,jdbcType=VARCHAR},
       </if>
+      <if test="isDelivery != null">
+        #{isDelivery,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmOrderDetailsExample" resultType="java.lang.Integer">
@@ -367,6 +374,9 @@
       <if test="record.deliveryId != null">
         VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
       </if>
+      <if test="record.isDelivery != null">
+        VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -396,7 +406,8 @@
       VOD_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
       VOD_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
-      VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR}
+      VOD_DELIVERY_ID = #{record.deliveryId,jdbcType=VARCHAR},
+      VOD_IS_DELIVERY = #{record.isDelivery,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -462,6 +473,9 @@
       <if test="deliveryId != null">
         VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
       </if>
+      <if test="isDelivery != null">
+        VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR},
+      </if>
     </set>
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
@@ -488,7 +502,8 @@
       VOD_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       VOD_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
       VOD_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
-      VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
+      VOD_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR},
+      VOD_IS_DELIVERY = #{isDelivery,jdbcType=VARCHAR}
     where VOD_DETAILS_ID = #{detailsId,jdbcType=VARCHAR}
   </update>
 </mapper>