Authored by qinchao

增加48小时处理

@@ -52,6 +52,9 @@ public class BuyerOrder { @@ -52,6 +52,9 @@ public class BuyerOrder {
52 @Getter@Setter 52 @Getter@Setter
53 private Integer sellerDeliveryDeal;//卖家的发货物流,操作员是否已经处理:0:未处理 ,1 :已处理 53 private Integer sellerDeliveryDeal;//卖家的发货物流,操作员是否已经处理:0:未处理 ,1 :已处理
54 54
  55 + @Getter@Setter
  56 + private Integer sellerDeliveryDealAgain;//48小时处理,操作员是否已经处理:0:未处理 ,1 :已处理
  57 +
55 public Integer getId() { 58 public Integer getId() {
56 return id; 59 return id;
57 } 60 }
@@ -22,11 +22,12 @@ @@ -22,11 +22,12 @@
22 <result column="platform_delivery_status" jdbcType="INTEGER" property="platformDeliveryStatus" /> 22 <result column="platform_delivery_status" jdbcType="INTEGER" property="platformDeliveryStatus" />
23 <result column="seller_delivery_status" jdbcType="INTEGER" property="sellerDeliveryStatus" /> 23 <result column="seller_delivery_status" jdbcType="INTEGER" property="sellerDeliveryStatus" />
24 <result column="seller_delivery_deal" jdbcType="INTEGER" property="sellerDeliveryDeal" /> 24 <result column="seller_delivery_deal" jdbcType="INTEGER" property="sellerDeliveryDeal" />
  25 + <result column="seller_delivery_deal_again" jdbcType="INTEGER" property="sellerDeliveryDealAgain" />
25 </resultMap> 26 </resultMap>
26 <sql id="Base_Column_List"> 27 <sql id="Base_Column_List">
27 id, uid, order_code, seller_uid, client_type, payment, payment_type, is_cancel, amount, 28 id, uid, order_code, seller_uid, client_type, payment, payment_type, is_cancel, amount,
28 ship_fee, status, create_time, update_time, buyer_order_status, seller_order_status, channel_no, attributes,platform_delivery_status, 29 ship_fee, status, create_time, update_time, buyer_order_status, seller_order_status, channel_no, attributes,platform_delivery_status,
29 - seller_delivery_status,seller_delivery_deal 30 + seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again
30 </sql> 31 </sql>
31 32
32 33
@@ -142,14 +143,14 @@ @@ -142,14 +143,14 @@
142 is_cancel, amount, ship_fee, 143 is_cancel, amount, ship_fee,
143 status, create_time, update_time, 144 status, create_time, update_time,
144 buyer_order_status, seller_order_status, channel_no, attributes,platform_delivery_status, 145 buyer_order_status, seller_order_status, channel_no, attributes,platform_delivery_status,
145 - seller_delivery_status,seller_delivery_deal) 146 + seller_delivery_status,seller_delivery_deal,seller_delivery_deal_again)
146 values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{sellerUid,jdbcType=INTEGER}, 147 values (#{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT}, #{sellerUid,jdbcType=INTEGER},
147 #{clientType,jdbcType=INTEGER}, #{payment,jdbcType=INTEGER}, #{paymentType,jdbcType=TINYINT}, 148 #{clientType,jdbcType=INTEGER}, #{payment,jdbcType=INTEGER}, #{paymentType,jdbcType=TINYINT},
148 #{isCancel,jdbcType=TINYINT}, #{amount,jdbcType=DECIMAL}, #{shipFee,jdbcType=DECIMAL}, 149 #{isCancel,jdbcType=TINYINT}, #{amount,jdbcType=DECIMAL}, #{shipFee,jdbcType=DECIMAL},
149 #{status,jdbcType=INTEGER}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}, 150 #{status,jdbcType=INTEGER}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER},
150 #{buyerOrderStatus,jdbcType=INTEGER}, #{sellerOrderStatus,jdbcType=INTEGER}, #{channelNo,jdbcType=VARCHAR}, 151 #{buyerOrderStatus,jdbcType=INTEGER}, #{sellerOrderStatus,jdbcType=INTEGER}, #{channelNo,jdbcType=VARCHAR},
151 #{attributes,jdbcType=INTEGER},#{platformDeliveryStatus,jdbcType=INTEGER}, 152 #{attributes,jdbcType=INTEGER},#{platformDeliveryStatus,jdbcType=INTEGER},
152 - #{sellerDeliveryStatus,jdbcType=INTEGER},#{sellerDeliveryDeal,jdbcType=INTEGER}) 153 + #{sellerDeliveryStatus,jdbcType=INTEGER},#{sellerDeliveryDeal,jdbcType=INTEGER},#{sellerDeliveryDealAgain,jdbcType=INTEGER})
153 </insert> 154 </insert>
154 <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.BuyerOrder" useGeneratedKeys="true"> 155 <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yohoufo.dal.order.model.BuyerOrder" useGeneratedKeys="true">
155 insert into buyer_order 156 insert into buyer_order
@@ -225,6 +225,7 @@ public class SubmitOrderServiceImpl implements ISubmitOrderService { @@ -225,6 +225,7 @@ public class SubmitOrderServiceImpl implements ISubmitOrderService {
225 buyerOrder.setPlatformDeliveryStatus(0);//平台发货状态给默认值 225 buyerOrder.setPlatformDeliveryStatus(0);//平台发货状态给默认值
226 buyerOrder.setSellerDeliveryStatus(0); 226 buyerOrder.setSellerDeliveryStatus(0);
227 buyerOrder.setSellerDeliveryDeal(0); 227 buyerOrder.setSellerDeliveryDeal(0);
  228 + buyerOrder.setSellerDeliveryDealAgain(0);
228 buyerOrderMapper.insert(buyerOrder); 229 buyerOrderMapper.insert(buyerOrder);
229 } 230 }
230 231