Merge remote-tracking branch 'origin/v17.3_youhua_20240615' into test

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -639,6 +639,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return list(lQrWrapper()
                 .eq(OrderChild :: getOrderNo,orderNo)
                 .in(OrderChild :: getStatus,status)
+                .orderByDesc(OrderChild :: getId)
         );
     }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -369,7 +369,7 @@ public class OrderGoodsSqlProvider {
         for(CancelOrderGoodsWeightDTO item : cancelOrderGoodsWeight){
             sj.add("update order_goods set residue_transport_weight = residue_transport_weight +" + item.getCancelWeight() +
                     ", already_transport_weight = already_transport_weight -" + item.getCancelWeight() +
-                    " where order_goods_no = "+item.getOrderGoodsNo()) ;
+                    " where order_goods_no = '"+item.getOrderGoodsNo() + "'") ;
         }
         return sj.toString();