2e7714aa 刘嘉

1.菠萝派接口-发货,更新发货时间

2.菠萝派接口-商品查询,商品与SKU价格都是查询经销商
1 个父辈 a55a1469
...@@ -177,11 +177,11 @@ ...@@ -177,11 +177,11 @@
177 <resultMap id="downloadProductSkuBeanList" type="com.sibu.orderHelper.integral.model.DownloadProductSkuBean"> 177 <resultMap id="downloadProductSkuBeanList" type="com.sibu.orderHelper.integral.model.DownloadProductSkuBean">
178 <result column="sku_id" property="SkuID"/> 178 <result column="sku_id" property="SkuID"/>
179 <result column="sku_id" property="skuOuterID"/> 179 <result column="sku_id" property="skuOuterID"/>
180 <result column="market_price" property="skuprice"/> 180 <result column="retail_price" property="skuprice"/>
181 <result column="stock_num" property="skuQuantity"/> 181 <result column="stock_num" property="skuQuantity"/>
182 </resultMap> 182 </resultMap>
183 <select id="getDownloadProductSkuBeanList" parameterType="java.lang.String" resultMap="downloadProductSkuBeanList"> 183 <select id="getDownloadProductSkuBeanList" parameterType="java.lang.String" resultMap="downloadProductSkuBeanList">
184 SELECT sku_id,stock_num,market_price FROM sku WHERE im_product_id = #{productId} 184 SELECT sku_id,stock_num,retail_price FROM sku WHERE im_product_id = #{productId}
185 </select> 185 </select>
186 186
187 <resultMap id="sku" type="com.sibu.orderHelper.integral.model.DownloadProductSkuBean"> 187 <resultMap id="sku" type="com.sibu.orderHelper.integral.model.DownloadProductSkuBean">
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
384 <if test="buyerUsername !=null and buyerUsername !='' "> 384 <if test="buyerUsername !=null and buyerUsername !='' ">
385 buyer_username =#{buyerUsername}, 385 buyer_username =#{buyerUsername},
386 </if> 386 </if>
387 erp_import = 1,erp_import_dt = now(), 387 erp_import = 1,erp_import_dt = now(),ship_dt = now(),
388 order_status = 4 388 order_status = 4
389 </set> 389 </set>
390 WHERE order_code = #{orderCode} 390 WHERE order_code = #{orderCode}
......