Default Changelist

CeDo

2021-04-22 037507bbe28ab8093c8cb20b4af85888f67be65a

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

@@ -580,11 +580,11 @@
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if(orderShipDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount()+"已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy("用户");
                orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){
@@ -621,11 +621,11 @@
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.deliver);
            orderOperateDO.setOperationTime(new Date());
            if(orderDeliverDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("已发货");
                orderOperateDO.setOperationBy("用户");
                orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){
@@ -663,7 +663,7 @@
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("订单已完成");
                orderOperateDO.setOperationBy("用户");
                orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
            }
            int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
            if(inserted!=1){