zoujiajian 1 سال پیش
والد
کامیت
cc38a9647a

+ 9 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/UserMirrorShop.java

@@ -3,6 +3,8 @@ package com.cyksj.model.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.BaseEntity;
+import com.cyksj.model.views.UserMirrorShopApplyInfoView;
+import com.ejlchina.searcher.bean.DbIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -63,6 +65,13 @@ public class UserMirrorShop extends BaseEntity {
 	 */
 	private String remark;
 
+	/**
+	 * 申请修改记录
+	 */
+	@DbIgnore
+	@TableField(exist = false)
+	private UserMirrorShopApplyInfoView applyInfoView;
+
 	@Getter
 	public enum Status {
 		verify("审核中"),

+ 4 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorShopController.java

@@ -13,6 +13,7 @@ import com.cyksj.model.entity.UserMirrorShop;
 import com.cyksj.model.entity.UserMirrorShopApplyRecord;
 import com.cyksj.model.entity.YhShopApplyRecord;
 import com.cyksj.model.request.UserMirrorShopApplyMoneyReq;
+import com.cyksj.model.views.UserMirrorShopApplyInfoView;
 import com.cyksj.service.mirrorshop.CmsUserMirrorShopService;
 import com.cyksj.web.util.StpUserMirrorShopManageUser;
 import com.cyksj.web.util.StpYhShopManageUser;
@@ -54,6 +55,9 @@ public class CmsUserMirrorShopController {
 		UserMirrorShop detailView = beanSearcher.searchFirst(UserMirrorShop.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(UserMirrorShop::getUserId, yhShopUserId)
 				.build());
+		UserMirrorShopApplyInfoView userMirrorShopApplyInfoView = beanSearcher.searchFirst(UserMirrorShopApplyInfoView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(UserMirrorShopApplyInfoView::getUserId, yhShopUserId).orderBy(UserMirrorShopApplyInfoView::getId).desc().build());
+		detailView.setApplyInfoView(userMirrorShopApplyInfoView);
 		return GatewayResponse.SUCCESS.newBuilder().toResult(detailView);
 	}