d0fcac64 刘嘉

菠萝派接口- 发货,运单号有多个以;分割

1 个父辈 694069be
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
363 363
364 <!-- 订单发货--> 364 <!-- 订单发货-->
365 <select id="getOrderByMap" parameterType="java.util.Map" resultType="java.lang.Integer"> 365 <select id="getOrderByMap" parameterType="java.util.Map" resultType="java.lang.Integer">
366 SELECT COUNT(*) FROM ${doingOrderTable} WHERE express_code like concat(#{expressCode},'%') AND order_code = #{orderCode} 366 SELECT COUNT(*) FROM ${doingOrderTable} WHERE express_code like concat(concat('%',#{expressCode},'%')) AND order_code = #{orderCode}
367 AND supplier_id = #{supplierId} 367 AND supplier_id = #{supplierId}
368 </select> 368 </select>
369 369
...@@ -431,7 +431,7 @@ ...@@ -431,7 +431,7 @@
431 buyer_username =#{buyerUsername}, 431 buyer_username =#{buyerUsername},
432 </if> 432 </if>
433 <if test="expressCode !=null and expressCode !='' "> 433 <if test="expressCode !=null and expressCode !='' ">
434 express_code = concat(IFNULL(concat(express_code,','),''),#{expressCode}), 434 express_code = #{expressCode},
435 </if> 435 </if>
436 <if test="buyerPhone !=null and buyerPhone !=''"> 436 <if test="buyerPhone !=null and buyerPhone !=''">
437 buyer_phone = #{buyerPhone}, 437 buyer_phone = #{buyerPhone},
......
...@@ -63,6 +63,14 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen ...@@ -63,6 +63,14 @@ public class PineappleSendBizServiceImpl extends AbstractBizService<PineappleSen
63 63
64 if(num > 0){ 64 if(num > 0){
65 params.put("expressCode",""); 65 params.put("expressCode","");
66 }else{
67 if(!StringUtil.isNull(callRequest.getBizModel().getLogisticNo())){
68 if(StringUtil.isNull(iMDoingOrderBean.getExpressCode())){
69 params.put("expressCode",callRequest.getBizModel().getLogisticNo());
70 }else{
71 params.put("expressCode",iMDoingOrderBean.getExpressCode()+";"+callRequest.getBizModel().getLogisticNo());
72 }
73 }
66 } 74 }
67 if(StringUtil.isNull(callRequest.getBizModel().getSenderName())){ 75 if(StringUtil.isNull(callRequest.getBizModel().getSenderName())){
68 params.put("buyerUsername",""); 76 params.put("buyerUsername","");
......