78508 78515

CeDo

2021-04-22 3de774529984d802420187314c0ec2a36596eac1

78508 78515

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java

@@ -18,4 +18,10 @@

    @ApiModelProperty(value = "手机号",hidden = true)
    private String phone;

    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;

    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin = false;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -329,7 +329,7 @@
     */
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java

@@ -50,11 +50,10 @@

    /**
     * 根据订单id取消订单
     * @param orderId   订单id
     * @param phone 操作用户手机号
     * @param comShopOrderQueryDTO   订单信息
     * @return  取消结果
     */
    R orderCancel(Long orderId,String phone);
    R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单

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

@@ -418,15 +418,14 @@

    /**
     * 根据订单id取消订单
     * @param orderId   订单id
     * @param phone 操作用户手机号
     * @param comShopOrderQueryDTO   订单信息
     * @return  取消结果
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public R orderCancel(Long orderId,String phone){
    public R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO){
        //查询订单
        ComShopOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
        ComShopOrderDO shopOrderDO = this.baseMapper.selectById(comShopOrderQueryDTO.getOrderId());
        if(shopOrderDO == null){
            return R.fail("未查询到订单");
        }
@@ -441,9 +440,9 @@
            orderOperateDO.setOrderNo(shopOrderDO.getOrderNo());
            orderOperateDO.setOperationType(ComShopOrderOperateDO.operationType.cancel);
            orderOperateDO.setOperationTime(new Date());
            if(StringUtils.isNotEmpty(phone)){
                orderOperateDO.setOperationContent("用户" + phone + "取消订单");
                orderOperateDO.setOperationBy("用户" + phone);
            if(comShopOrderQueryDTO.getIsAdmin()){
                orderOperateDO.setOperationContent("管理员" + comShopOrderQueryDTO.getOperUserAccount() + "取消订单");
                orderOperateDO.setOperationBy("用户" + comShopOrderQueryDTO.getOperUserAccount());
            }else {
                orderOperateDO.setOperationContent("用户取消订单");
                orderOperateDO.setOperationBy("用户");

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java

@@ -57,12 +57,12 @@
                    R r = tokenService.loginShopBackStage(account, password);
                    return r;
                } else {
                    return R.fail("商家状态异常，无法登陆");
                    return R.fail("账号被禁用");
                }
            }
            return R.fail("商家不存在");
        }catch (Exception e){
            return R.fail();
            return R.fail("登陆失败了");
        }
    }


 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java

@@ -78,6 +78,8 @@
    @PutMapping("/cancel")
    @ShopOperLog(operType = 8)
    public R cancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO){
        comShopOrderQueryDTO.setOperUserAccount(getLoginUserInfo().getAccount());
        comShopOrderQueryDTO.setIsAdmin(true);
        return communityService.orderCancel(comShopOrderQueryDTO);
    }