Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 cd78533e18559e5463cbb56a8871063212977e24

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -695,6 +695,12 @@
                orderOperateDO.setOperationBy("用户");
            }
            comShopFlowerOrderOperateDAO.insert(orderOperateDO);

            //一个自提订单算一个货
            ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(shopOrderDO.getPointId());
            convenientElevatingPointDO.setPrepareGoodsNum(convenientElevatingPointDO.getPrepareGoodsNum() - 1);
            convenientElevatingPointDO.setAlreadyGoodsNum(convenientElevatingPointDO.getAlreadyGoodsNum() + 1);
            convenientElevatingPointDAO.updateById(convenientElevatingPointDO);
            return R.ok();
        } else {
            return R.fail("确认收货失败");