hmp преди 4 години
родител
ревизия
b263e968a1

+ 1 - 1
ldt-core/src/main/java/org/springblade/gateway/goods_gatway/controller/AppGoodsBillsController.java

@@ -92,7 +92,7 @@ public class AppGoodsBillsController extends BladeController {
 		}
 		IPage<GoodsBills> pages = appGoodsBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsBills).lambda()
 			.like(StrUtil.isNotEmpty(formatTime),GoodsBills::getCreateTime,formatTime).orderByDesc(GoodsBills::getCreateTime));
-		return R.data(GoodsBillsWrapper.build().pageVO(pages));
+		return R.data(GoodsBillsWrapper.build(shopService).pageVO(pages));
 	}
 
 	/**

+ 5 - 0
ldt-core/src/main/java/org/springblade/ldt/bills/vo/GoodsBillsVO.java

@@ -40,4 +40,9 @@ public class GoodsBillsVO extends GoodsBills {
 	@ApiModelProperty(value = "付款人")
 	private String payer;
 
+
+	private String shopName;
+
+	private String shopPic;
+
 }

+ 24 - 5
ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/GoodsBillsWrapper.java

@@ -20,7 +20,11 @@ import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.ldt.bills.entity.GoodsBills;
 import org.springblade.ldt.bills.vo.GoodsBillsVO;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * 订单包装类,返回视图层所需的字段
@@ -30,19 +34,34 @@ import java.util.Objects;
  */
 public class GoodsBillsWrapper extends BaseEntityWrapper<GoodsBills, GoodsBillsVO>  {
 
+	private IShopService shopService;
+
+	public GoodsBillsWrapper(IShopService shopService) {
+		this.shopService = shopService;
+	}
+
+	public GoodsBillsWrapper() {
+	}
+
 	public static GoodsBillsWrapper build() {
 		return new GoodsBillsWrapper();
  	}
 
+	public static GoodsBillsWrapper build(IShopService shopService) {
+		return new GoodsBillsWrapper(shopService);
+	}
+
 	@Override
 	public GoodsBillsVO entityVO(GoodsBills goodsBills) {
 		GoodsBillsVO goodsBillsVO = Objects.requireNonNull(BeanUtil.copy(goodsBills, GoodsBillsVO.class));
 
-		//User createUser = UserCache.getUser(goodsBills.getCreateUser());
-		//User updateUser = UserCache.getUser(goodsBills.getUpdateUser());
-		//goodsBillsVO.setCreateUserName(createUser.getName());
-		//goodsBillsVO.setUpdateUserName(updateUser.getName());
-
+		if (shopService != null) {
+			Shop shop = shopService.getById(goodsBillsVO.getReceiveId());
+			String shopName= Optional.ofNullable(shop).map(Shop::getName).orElse("");
+			String shopPic= Optional.ofNullable(shop).map(Shop::getShopPic).orElse("");
+			goodsBillsVO.setShopName(shopName);
+			goodsBillsVO.setShopPic(shopPic);
+		}
 		return goodsBillsVO;
 	}