#feat 发货啊

yanghui

2022-11-28 c0150e494eca9fefcb20a1aee8c284e9d194ebbe

#feat 发货啊

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -542,6 +542,7 @@
    @PostMapping("/shipOrderFlower")
    @ApiOperation(value = "订单发货")
    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount());
        return communityService.shipOrderFlower(orderShipDTO);
    }
}

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

@@ -681,13 +681,9 @@
            orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopFlowerOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if (orderShipDTO.getIsAdmin()) {

                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            } else {
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }
            int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
            if (inserted != 1) {
                log.error("订单发货日志保存错误");