修改orders接口，增加changeAddress接口

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/OrderApiController.java

@@ -69,6 +69,14 @@ public class OrderApiController extends BaseApiController {
     public OrderDetailResponse detail(OrderDetailRequest request){
         return orderServiceI.get(getUserContext(), request);
     }
+
+    /**
+     * 订单修改地址
+     */
+    @PostMapping("/changeAddress")
+    public boolean changeAddress(@RequestBody OrderChangeAddressRequest request){
+        return orderServiceI.changeAddress(getUserContext(), request);
+    }
 //
 //    /**
 //     * 支付返回接口（未定）

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/OrderChangeAddressRequest.java

@@ -0,0 +1,14 @@
+package com.xingxi.api.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrderChangeAddressRequest {
+
+    private Long orderId;
+
+    private Long userAddressId;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/OrderServiceI.java

@@ -13,6 +13,7 @@ public interface OrderServiceI {
     OrderCreateResponse create(UserContext userContext, OrderCreateRequest request);
 
     OrderDetailResponse get(UserContext userContext, OrderDetailRequest request);
+    boolean changeAddress(UserContext userContext, OrderChangeAddressRequest request);
 
     PaymentInfo selectPaymentInfoByOutTradeNo(String outTradeNo);
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/OrderApiServiceImpl.java

@@ -121,11 +121,14 @@ class OrderApiServiceImpl implements OrderServiceI {
         condOrder.setDelFlag(EDelFlag.NO.getVal());
 
         PageUtils.startPage();
-        Page<OrderDTO> orderList  = PageHelper.startPage(pageNum, pageSize)
-                .doSelectPage(() -> orderMapper.selectOrderList(condOrder));
+        Page<Order> orderList  = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> wxApiOrderMapper.selectOrderList(condOrder));
+
+        List<OrderDTO> orderDTOList = new ArrayList<>();
 
         if (!orderList.isEmpty()) {
-            for (OrderDTO order : orderList) {
+
+            for (Order order : orderList) {
                 OrderDetail condOderDetail = new OrderDetail();
                 condOderDetail.setOrderId(order.getOrderId());
                 List<OrderDetail> orderDetailList = orderDetailMapper.selectOrderDetailList(condOderDetail);
@@ -145,12 +148,16 @@ class OrderApiServiceImpl implements OrderServiceI {
 
                     odDtoList.add(odDto);
                 }
+                OrderDTO dto = new OrderDTO();
+                BeanUtils.copyBeanProp(dto,order);
 
-                order.setOrderDetailDTOS(odDtoList);
+                dto.setOrderDetailDTOS(odDtoList);
+
+                orderDTOList.add(dto);
             }
         }
 
-        return null;
+        return new OrderQueryResponse(orderDTOList);
     }
 
     @Override
@@ -380,6 +387,7 @@ class OrderApiServiceImpl implements OrderServiceI {
                 getOrderDTOByOrderId(orderId)
         );
     }
+
     private OrderDTO getOrderDTOByOrderId(Long orderId){
         OrderDTO rtn = new OrderDTO();
         Order order = wxApiOrderMapper.selectOrderByOrderId(orderId);
@@ -405,6 +413,29 @@ class OrderApiServiceImpl implements OrderServiceI {
     }
 
     @Override
+    public boolean changeAddress(UserContext userContext, OrderChangeAddressRequest request) {
+
+        Long orderId = request.getOrderId();
+        Long userAddressId = request.getUserAddressId();
+
+        Order order = wxApiOrderMapper.selectOrderByOrderId(orderId);
+        UserAddress address = wxApiUserAddressMapper.selectUserAddressByUserAddressId(userAddressId);
+
+        order.setRecProv(address.getProvince());
+        order.setRecCity(address.getCity());
+        order.setRecDistrict(address.getDistrict());
+        order.setRecAddress(address.getAddress());
+        order.setRecMobile(address.getMobile());
+        order.setRecName(address.getRecipient());
+        order.setUpdateTime(new Date());
+        order.setUpdateUser(userContext.getCurrentUser().getWxOpenId());
+
+        wxApiOrderMapper.updateOrder(order);
+        return true;
+
+    }
+
+    @Override
     public PaymentInfo selectPaymentInfoByOutTradeNo(String outTradeNo) {
         return wxApiPaymentInfoMapper.selectPaymentInfoByOutTradeNo(outTradeNo);
     }

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application.yml

@@ -35,5 +35,5 @@ aliyun:
     accessKeySecret: kAIazWRGoz1ird2ynzwgcwWzM9vMCu
     bucketName: bucket-gululuq
     # 如果有自定义域名
-    customDomain: res.gululuq.com
+    customDomain: restest.gululuq.com