订单

mec-client-api/src/main/java/com/ym/mec/web/WebFeignService.java

@@ -101,5 +101,5 @@ public interface WebFeignService {
 
     // 商城商品库存更新，同步商品库存
     @PostMapping("/api/schoolListByIds")
-    HttpResponseResult<SchoolDto> schoolListByIds(List<Long> schoolIds);
+    HttpResponseResult<List<SchoolDto>> schoolListByIds(List<Long> schoolIds);
 }

mec-client-api/src/main/java/com/ym/mec/web/fallback/WebFeignServiceFallback.java

@@ -129,7 +129,7 @@ public class WebFeignServiceFallback implements WebFeignService {
 	}
 
     @Override
-    public HttpResponseResult<SchoolDto> schoolListByIds(List<Long> schoolIds) {
+    public  HttpResponseResult<List<SchoolDto>> schoolListByIds(List<Long> schoolIds) {
         return null;
     }
 }

mec-common/common-core/src/main/java/com/ym/mec/common/dto/OrderCreate.java

@@ -61,6 +61,9 @@ public class OrderCreate {
 //    @ApiModelProperty("商品详情")
     private List<OrderItem> orderItemList;
 
+
+//    @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单 2->学校采购")
+    private Integer sourceType;
     @Data
     public static class OrderItem implements Serializable {
 

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dto/OrderVo.java

@@ -23,6 +23,16 @@ public class OrderVo extends OmsOrder {
     @ApiModelProperty("用户类型 STUDENT：学生  TEACHER:老师")
     private String userType;
 
+    @ApiModelProperty("学校名称")
+    private String schoolName;
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
 
     public String getUserId() {
         return userId;

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.ym.mec.common.dto.SchoolDto;
 import com.ym.mec.common.entity.GoodsSubStockModel;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
@@ -77,6 +78,23 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         PageHelper.startPage(pageNum, pageSize);
         List<OrderVo> list = orderDao.getList(queryParam);
 
+        // 过滤出学校订单，查询学校信息
+        List<Long> schoolIds = list.stream().filter(o->o.getSourceType() ==2).map(OmsOrder::getMemberId).collect(Collectors.toList());
+
+        if (!CollectionUtils.isEmpty(schoolIds)) {
+            HttpResponseResult<List<SchoolDto>> schoolDtoHttpResponseResult = webFeignService.schoolListByIds(schoolIds);
+            if (schoolDtoHttpResponseResult.getCode() == 200 && schoolDtoHttpResponseResult.getStatus()) {
+                Map<Long, SchoolDto> schoolDtoMap = schoolDtoHttpResponseResult.getData().stream().collect(Collectors.toMap(SchoolDto::getId, o -> o));
+                list.forEach(o->{
+                    if (o.getSourceType() == 2) {
+                        SchoolDto schoolDto = schoolDtoMap.get(o.getMemberId());
+                        if (schoolDto != null) {
+                            o.setSchoolName(schoolDto.getName());
+                        }
+                    }
+                });
+            }
+        }
 
         return list;
     }

mec-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsOrder.java

@@ -11,7 +11,7 @@ public class OmsOrder implements Serializable {
 
     private Long memberId;
 
-    private Long orchestraId;
+    private String orchestraId;
 
     private String couponId;
 
@@ -58,7 +58,7 @@ public class OmsOrder implements Serializable {
     @ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信")
     private Integer payType;
 
-    @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单")
+    @ApiModelProperty(value = "订单来源：0->PC订单；1->app订单 2->学校订单")
     private Integer sourceType;
 
     @ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
@@ -153,11 +153,11 @@ public class OmsOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Long getOrchestraId() {
+    public String getOrchestraId() {
         return orchestraId;
     }
 
-    public void setOrchestraId(Long orchestraId) {
+    public void setOrchestraId(String orchestraId) {
         this.orchestraId = orchestraId;
     }
 

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
+import com.beust.jcommander.internal.Lists;
 import com.github.pagehelper.PageHelper;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.MallCreateOrderModel;
@@ -685,7 +686,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         PageHelper.startPage(pageNum, pageSize);
         OmsOrderExample orderExample = new OmsOrderExample();
         OmsOrderExample.Criteria criteria = orderExample.createCriteria();
-        criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId());
+        criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId()).andSourceTypeNotIn(Lists.newArrayList(2));
         if (status != null && !StringUtil.isEmpty(status)) {
             List<Long> list = StringUtil.toLongList(status);
             List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());