店铺订单展示店铺信息

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

@@ -224,6 +224,21 @@ public class OrderDonBackView {
 	@DbField("o.phone")
 	private String orderPhone;
 
+	@DbField("o.yhs_id")
+	private Long yhsId;
+
+	/**
+	 * 店铺自定义id
+	 */
+	@DbIgnore
+	private String customId;
+
+	/**
+	 * 店铺名
+	 */
+	@DbIgnore
+	private String shopName;
+
 	@DbIgnore
 	private OrderDonWaybill waybill;
 

netflix-dao/src/main/java/com/cyksj/model/views/GroupsDataStatisticsView.java

@@ -78,7 +78,7 @@ public class GroupsDataStatisticsView {
 	private BigDecimal newBuyOrderMoney;
 
 	/**
-	 * 解绑渠道销售金额
+	 * 解绑渠道流媒体销售金额
 	 */
 	private BigDecimal unBIndGroupsStreamingMoney;
 

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

@@ -26,6 +26,7 @@ import com.cyksj.mapper.channel.UserPayEquipmentAvailableBenefitsMapper;
 import com.cyksj.mapper.channel.UserPayEquipmentReceiveBenefitsRecordMapper;
 import com.cyksj.mapper.manage.RealGoodsOrderHandleMapper;
 import com.cyksj.mapper.manage.coupon.CouponMapper;
+import com.cyksj.mapper.shop.YhShopMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.excel.ExcelOrderDonData;
 import com.cyksj.model.excel.ExcelRealGoodsOrderData;
@@ -97,6 +98,8 @@ public class CmsOrderController {
 
 	private final UserPayEquipmentAvailableBenefitsMapper availableBenefitsMapper;
 
+	private final YhShopMapper yhShopMapper;
+
 
 	@GetMapping("/get")
 	@SaCheckPermission("order:view")
@@ -164,6 +167,13 @@ public class CmsOrderController {
 							data.setIsHasBenefits(count == 0 ? true : false);
 						}
 					});
+			if (data.getYhsId() != 0) {
+				Optional.ofNullable(yhShopMapper.selectById(data.getYhsId()))
+						.ifPresent(e -> {
+							data.setShopName(e.getName());
+							data.setCustomId(e.getCustomId());
+						});
+			}
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}