bugfixed:商家订单-配送完成,订单状态为待收货， 发货状态为“配送完成”

CeDo

2021-04-23 b2c2f6394f02daee351f5c6b79083132df7ebca5

bugfixed:商家订单-配送完成,订单状态为待收货， 发货状态为“配送完成”

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

@@ -647,11 +647,10 @@
        if(!(comShopOrderDO.getStatus() == 3)){
            return R.fail("订单还未发货");
        }
        comShopOrderDO.setStatus(4);
        //comShopOrderDO.setStatus(4);
        comShopOrderDO.setDeliveryStatus(5);
        int updated = comShopOrderDAO.updateById(comShopOrderDO);
        if(updated==1){

            //创建订单操作记录
            ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());