Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!638

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -183,8 +183,9 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
                             .set(GoodsSku::getQuantity, goodsSku.getQuantity() + orderItem.getGoodsNum())
                             .set(GoodsSku::getSoldQty, goodsSku.getSoldQty() - orderItem.getGoodsNum())
                             .eq(GoodsSku::getSkuId, goodsSku.getSkuId())
-                            .eq(GoodsSku::getQuantity, goodsSku.getGoodsId())
-                            .eq(GoodsSku::getProperties, orderItem.getProperties()));
+                            .eq(GoodsSku::getGoodsId, goodsSku.getGoodsId())
+                            .eq(GoodsSku::getQuantity, goodsSku.getQuantity())
+                            .eq(GoodsSku::getSoldQty, goodsSku.getSoldQty()));
 
                     Assert.isTrue(updateSku, "现金购买商品取消订单更新SKU库存失败。goodsId:" + goodsSku.getGoodsId() + ",skuId:" + goodsSku.getSkuId());
                 }