zoujiajian 2 년 전
부모
커밋
fe43bb245e

+ 6 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -260,9 +260,15 @@ public class OrderDonBackView {
 	@DbIgnore
 	private List<GoodsDonSkuView> benefitsViews;
 
+	/**
+	 * 客服id
+	 */
 	@DbIgnore
 	private Long cmsUserId;
 
+	/**
+	 * 客服名
+	 */
 	@DbIgnore
 	private String serviceName;
 }

+ 8 - 7
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -61,7 +61,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
+/** admin/订单惯例
  * @author chan
  * @date 2021/10/12 下午11:05
  */
@@ -213,12 +213,13 @@ public class CmsOrderController {
 				data.setRegister(StrUtil.isNotEmpty(user.getUnionid()) ? "wechat" : StrUtil.isNotEmpty(user.getLoginPhone()) ? "phone" : "email");
 
 			}
-			//获取订单关联客服
-			Optional.ofNullable(orderDonMapper.selectOrderRelate(data.getId())).ifPresent(e->{
-				data.setCmsUserId(e.getCmsUserId());
-				data.setNickname(e.getNickname());
-			});
-
+			if (data.getGoodsDonType() == 1) {
+				//获取订单关联客服
+				Optional.ofNullable(orderDonMapper.selectOrderRelate(data.getId())).ifPresent(e->{
+					data.setCmsUserId(e.getCmsUserId());
+					data.setNickname(e.getNickname());
+				});
+			}
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}