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

优化

See merge request quanshu/mp-server!933

mp-service/src/main/java/com/qs/mp/framework/service/impl/AsyncTaskServiceImpl.java

@@ -216,9 +216,8 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
             for (GoodsCard goodsCard : goodsCardList) {
                 boolean rtn = goodsCardService.update(new LambdaUpdateWrapper<GoodsCard>()
                     .set(GoodsCard::getIsUse, 1)
-                    .eq(GoodsCard::getId, goodsCard)
-                    .eq(GoodsCard::getIsUse, 0)
-                );
+                    .eq(GoodsCard::getId, goodsCard.getId())
+                    .eq(GoodsCard::getIsUse, 0));
                 if (!rtn) {
                     LogUtil.error(logger, "卡密分配失败。orderId={0},itemId={1},goodsId={2}",userDeliverOrderItem.getOrderId(),
                         userDeliverOrderItem.getItemId(), userDeliverOrderItem.getGoodsId());