Merge branch 'master' into dev

@@ -47,4 +47,6 @@ public interface BuyerOrderMapper {
 
 
     // 根据uid查询订单总数
     // 根据uid查询订单总数
     Integer selectOrderNumByUid(@Param("uid")int uid);
     Integer selectOrderNumByUid(@Param("uid")int uid);
+    
+    BuyerOrder selectAllByOrderCode(@Param("orderCode") Long orderCode);
 }
 }

@@ -346,4 +346,12 @@
     from buyer_order
     from buyer_order
     where uid = #{uid,jdbcType=INTEGER}
     where uid = #{uid,jdbcType=INTEGER}
   </select>
   </select>
+  
+  <select id="selectAllByOrderCode" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from buyer_order
+    where order_code = #{orderCode,jdbcType=BIGINT}
+    limit 1
+  </select>
 </mapper>
 </mapper>

@@ -375,13 +375,12 @@ public class SellerOrderService  implements IOrderListService, IOrderDetailServi
             target.setId(sellerOrder.getId());
             target.setId(sellerOrder.getId());
             target.setIsDel(DelStatus.IS_DEL.getCode());
             target.setIsDel(DelStatus.IS_DEL.getCode());
             target.setUpdateTime(DateUtil.getCurrentTimeSecond());
             target.setUpdateTime(DateUtil.getCurrentTimeSecond());
-            int row = sellerOrderMapper.updateByPrimaryKeySelective(target);
-            return row > 0;
+            sellerOrderMapper.updateByPrimaryKeySelective(target);
         }
         }
 
 
 
 
         if(OrderCodeType.BUYER_TYPE.getType() == codeMeta.getType()){
         if(OrderCodeType.BUYER_TYPE.getType() == codeMeta.getType()){
-            BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode);
+            BuyerOrder buyerOrder = buyerOrderMapper.selectAllByOrderCode(orderCode);
             //todo 判断状态后更新
             //todo 判断状态后更新
             checkBuyCanDelStatus(buyerOrder.getStatus());
             checkBuyCanDelStatus(buyerOrder.getStatus());