后台管理:会员订单详情+地址信息展示;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderExtVo.java

 package com.liquidnet.service.adam.dto.vo;
 
+import com.liquidnet.service.adam.entity.AdamMemberOrderExt;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,4 +31,14 @@ public class AdamMemberOrderExtVo implements Serializable, Cloneable {
             return new AdamMemberOrderExtVo();
         }
     }
+
+    public AdamMemberOrderExtVo copy(AdamMemberOrderExt source) {
+        if (null == source) return this;
+        this.setOrderNo(source.getOrderNo());
+        this.setExpressStatus(source.getExpressStatus());
+        this.setExpressReceiver(source.getExpressReceiver());
+        this.setExpressPhone(source.getExpressPhone());
+        this.setExpressAddress(source.getExpressAddress());
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/MemberOrderDetailAdminVo.java

 package com.liquidnet.service.adam.dto.vo.admin;
 
+import com.liquidnet.service.adam.dto.vo.AdamMemberOrderExtVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
@@ -21,4 +22,5 @@ public class MemberOrderDetailAdminVo {
     private AdamUser adamUser;
     private AdamUserInfoVo adamUserInfoVo;
     private AdamUserMemberVo adamUserMemberVo;
+    private AdamMemberOrderExtVo adamMemberOrderExtVo;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html

@@ -65,7 +65,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">会员卡名称：</label>
                 <div class="col-sm-8">
-                    <input name="state" th:field="*{adamMemberOrderVo.memberName}" class="form-control" type="text" readonly>
+                    <input name="memberName" th:field="*{adamMemberOrderVo.memberName}" class="form-control" type="text" readonly>
                 </div>
             </div>
 <!--            <div class="form-group">-->
@@ -95,6 +95,18 @@
 <!--                    <input name="version" th:field="*{version}" class="form-control" type="text">-->
 <!--                </div>-->
 <!--            </div>-->
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收件人：</label>
+                <div class="col-sm-8">
+                    <input name="expressReceiver" th:value="|*{adamMemberOrderExtVo.expressReceiver} / *{adamMemberOrderExtVo.expressPhone}|" class="form-control" type="text" readonly>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">收件地址：</label>
+                <div class="col-sm-8">
+                    <input name="expressAddress" th:value="*{adamMemberOrderExtVo.expressAddress}" class="form-control" type="text" readonly>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.adam.dto.MemberOrderDto;
 import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
+import com.liquidnet.service.adam.dto.vo.AdamMemberOrderExtVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.dto.vo.admin.MemberOrderDetailAdminVo;
-import com.liquidnet.service.adam.entity.AdamMemberOrder;
-import com.liquidnet.service.adam.entity.AdamUser;
-import com.liquidnet.service.adam.entity.AdamUserInfo;
-import com.liquidnet.service.adam.entity.AdamUserMember;
-import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
-import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
-import com.liquidnet.service.adam.mapper.AdamUserMapper;
-import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
+import com.liquidnet.service.adam.entity.*;
+import com.liquidnet.service.adam.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +42,8 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
     private AdamUserInfoMapper adamUserInfoMapper;
     @Autowired
     private AdamUserMapper adamUserMapper;
+    @Autowired
+    private AdamMemberOrderExtMapper adamMemberOrderExtMapper;
 
     @Override
     public List<MemberOrderDto> getMemberOrderList(MemberOrderListReq memberOrderListReq) {
@@ -90,11 +88,14 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
         LambdaQueryWrapper<AdamUser> adamUserWrapper = new LambdaQueryWrapper();
         adamUserWrapper.eq(AdamUser::getUid,adamMemberOrderVo.getUid());
         adamUser = adamUserMapper.selectOne(adamUserWrapper);
+        // 查取快递信息
+        AdamMemberOrderExt adamMemberOrderExt = adamMemberOrderExtMapper.selectOne(Wrappers.lambdaQuery(AdamMemberOrderExt.class).eq(AdamMemberOrderExt::getOrderNo, orderNo));
 
         detailAdminVo.setAdamMemberOrderVo(adamMemberOrderVo);
         detailAdminVo.setAdamUserMemberVo(adamUserMemberVo);
         detailAdminVo.setAdamUserInfoVo(adamUserInfoVo);
         detailAdminVo.setAdamUser(adamUser);
+        detailAdminVo.setAdamMemberOrderExtVo(AdamMemberOrderExtVo.getNew().copy(adamMemberOrderExt));
         return detailAdminVo;
     }
 }