rk
昨天 79aebca90280ae4d4b25ed6ba6267128cdb61d3a
代码生成
已修改4个文件
8 ■■■■ 文件已修改
server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/vo/ActiveOrderTipVO.java
@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "订单状态")
    private Integer status;
    @ApiModelProperty(value = "订单状态文案")
    private String statusDesc;
    @ApiModelProperty(value = "状态提示文案")
    private String tip;
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -3624,6 +3624,7 @@
        ActiveOrderTipVO vo = new ActiveOrderTipVO();
        vo.setOrderId(order.getId());
        vo.setStatus(order.getStatus());
        vo.setStatusDesc(Constants.OrderStatus.getDescByKey(order.getStatus(), order.getType()));
        // 构建提示文案
        boolean isLocal = Constants.equalsInteger(order.getType(), Constants.ZERO);
server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
@@ -108,7 +108,7 @@
    @ApiOperation("维护门店信息(支付押金后)")
    @PostMapping("/maintain")
    public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
        shopInfoService.maintainShopInfo(this.getMemberId(), dto);
        shopInfoService.maintainShopInfo(this.getShopId(), dto);
        return ApiResponse.success("操作成功");
    }
server/web/src/main/resources/application.yml
@@ -12,7 +12,7 @@
spring:
  profiles:
    active: dev
    active: pro
  # JSON返回配置
  jackson:
    # 默认时区