feat: 订单默认信息,用户协议接口

mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/ServiceOrderController.java

@@ -15,6 +15,7 @@ import com.onsiteservice.dao.common.page.PageInfoVO;
 import com.onsiteservice.miniapp.controller.order.dto.CancelServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.PageServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.ReserveServiceOrderDTO;
+import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderDefDetailVO;
 import com.onsiteservice.miniapp.service.order.ServiceOrderBizService;
 import com.onsiteservice.service.order.ServiceOrderService;
 import io.swagger.annotations.Api;
@@ -142,4 +143,19 @@ public class ServiceOrderController {
         return success(serviceOrderBizService.pay(orderId, userId, request));
     }
 
+    /**
+     * 下单默认地址
+     */
+    @ApiOperation(value = "订单默认信息:默认地址,温馨提示")
+    @GetMapping("def-detail")
+    public Result<ServiceOrderDefDetailVO> defDetail(@CurrentUserId Long userId) {
+        return success(serviceOrderBizService.selectDefDetail(userId));
+    }
+
+    @ApiOperation(value = "用户协议")
+    @GetMapping("agreement")
+    public Result agreement() {
+        return success(serviceOrderBizService.agreement());
+    }
+
 }

mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/vo/ServiceOrderDefDetailVO.java

+package com.onsiteservice.miniapp.controller.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel("订单默认信息值对象")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ServiceOrderDefDetailVO {
+
+    @ApiModelProperty(value = "地址id")
+    private Long id;
+
+    @ApiModelProperty(value = "客户姓名")
+    private String name;
+
+    @ApiModelProperty(value = "客户手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "地址所在区域id")
+    private Long areaId;
+
+    @ApiModelProperty(value = "对应区域表name_path字段,例:山东省, 日照市, 东港区")
+    private String namePath;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "温馨提示")
+    private String tips;
+
+}
\ No newline at end of file

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

@@ -33,6 +33,7 @@ import com.onsiteservice.entity.user.User;
 import com.onsiteservice.miniapp.controller.order.dto.CancelServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.PageServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.ReserveServiceOrderDTO;
+import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderDefDetailVO;
 import com.onsiteservice.miniapp.service.weixin.pay.WechatNativePay;
 import com.onsiteservice.service.order.ServiceOrderService;
 import com.onsiteservice.util.AttrCopyUtils;
@@ -354,4 +355,30 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
     }
 
 
+    public ServiceOrderDefDetailVO selectDefDetail(Long userId) {
+        ServiceOrderDefDetailVO serviceOrderDefDetailVO = ServiceOrderDefDetailVO.builder().build();
+
+        Condition c = new Condition(ServiceAddress.class);
+        c.createCriteria().andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId)
+                .andEqualTo("def", true)
+                .andEqualTo(BizConstants.CommonConstants.DELETED, false);
+        List<ServiceAddress> serviceAddressList = serviceAddressMapper.selectByCondition(c);
+        if (!CollectionUtils.isEmpty(serviceAddressList)) {
+            log.info("order selectDefDetail userId: {}", userId);
+            serviceOrderDefDetailVO = AttrCopyUtils.copy(serviceAddressList.get(0), new ServiceOrderDefDetailVO());
+        }
+
+        // 温馨提示
+        String prompt = sysParamMapper.selectOne(SysParam.builder().code(SysParamConstants.USER_PROMPT).build()).getValue();
+        serviceOrderDefDetailVO.setTips(prompt);
+
+        return serviceOrderDefDetailVO;
+    }
+
+
+    public String agreement() {
+        return sysParamMapper.selectOne(SysParam.builder().code(SysParamConstants.AGREEMENT).build()).getValue();
+    }
+
+
 }

mini-app/src/main/resources/application.yaml

@@ -17,7 +17,7 @@ project:
     # 安全路径白名单 无需token
     ant-paths: "/error,**.html**,**.js,**.css,/favicon.ico,/webjars/**,/swagger**,
     /swagger-resources/configuration/ui,/**/v2/api-docs,/doc.html,/v2/api-docs-ext,/druid/**\
-    /,/websocket/**,/category/page,/subclass/**,/token/base,/dict,/common/*,/wechat/pay-notify"
+    /,/websocket/**,/category/page,/subclass/**,/token/base,/dict,/common/*,/wechat/pay-notify,/order/agreement"
     # 基础token可以访问的路径白名单
     base-token-ant-paths: "/login"
   schedule: