新增状态

src/main/java/org/springblade/modules/api/controller/AliPay01Controller.java

@@ -707,7 +707,7 @@ public class AliPay01Controller extends BladeController {
 					//税费金额
 					BigDecimal bigDecimal1 = bigDecimal.multiply(taxRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
 					//收款金额需扣除税费
-					price = new BigDecimal(consign.getConsignPrice()).subtract(bigDecimal1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+					price = new BigDecimal(consign.getConsignPrice()).subtract(bigDecimal1).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
 				}
 				//获取寄售人信息
 				UserApp userApp = new UserApp();

src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -64,8 +64,10 @@ import org.springblade.modules.shopping.service.IConsignService;
 import org.springblade.modules.shopping.vo.ConsignListVO;
 import org.springblade.modules.shopping.vo.ConsignVO;
 import org.springblade.modules.shopping.wrapper.ConsignWrapper;
+import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserApp;
 import org.springblade.modules.system.mapper.UserAppMapper;
+import org.springblade.modules.system.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -76,6 +78,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -106,6 +109,9 @@ public class Api05Controller extends BladeController {
 	@Resource
 	private UserAppMapper userAppMapper;
 
+	@Resource
+	private IUserService userService;
+
 	//抢购
 	private static final String TRADE_URL = "/api/v1/aliPay/sdk/trade_notify_url";
 	@Autowired
@@ -229,6 +235,13 @@ public class Api05Controller extends BladeController {
 		query.eq(Consign::getConsignState, 2);
 		query.eq(Consign::getNowStock, 0);
 		List<Consign> list = consignService.list(query);
+		//获取用户id
+		List<Long> collect = list.stream().map(Consign::getConsignUserId).collect(Collectors.toList());
+		List<User> users = userService.listByIds(collect);
+		for (Consign consign : list) {
+			Optional<User> first = users.stream().filter(s -> s.getId() == consign.getConsignUserId()).findFirst();
+			consign.setConsignUserName(first.get().getName());
+		}
 		return R.data(list);
 	}
 

src/main/java/org/springblade/modules/shopping/entity/Consign.java

@@ -110,6 +110,9 @@ public class Consign implements Serializable {
 	@ApiModelProperty(value = "寄售用户ID")
 	private Long consignUserId;
 
+	@ApiModelProperty(value = "寄售用户名称")
+	private String consignUserName;
+
 	/**
 	 * 寄售类型
 	 */
@@ -186,6 +189,4 @@ public class Consign implements Serializable {
 	@TableLogic
 	@ApiModelProperty(value = "删除标识")
 	private Integer isDeleted;
-
-
 }