|
|
@@ -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);
|
|
|
}
|