Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -610,7 +610,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
-                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(residueWeight, sum, orderGoodsStatus, orderGoods.getId());
+                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(sum, sum, orderGoodsStatus, orderGoods.getId());
                 }
                 break;
             default: