出价记录

ch-core/src/main/java/com/wwdz/ch/core/util/PriceUtil.java

@@ -26,6 +26,8 @@ public class PriceUtil {
         return bigDecimal.longValue();
     }
 
+
+
     public static Integer convertPriceFromStrToInt(String price){
         BigDecimal bigDecimal = new BigDecimal(price);
         bigDecimal = bigDecimal.multiply(new BigDecimal(100));
@@ -53,6 +55,9 @@ public class PriceUtil {
         DecimalFormat df = new DecimalFormat("#0.00");
         String a = df.format(bigDecimal);
         System.out.println(new BigDecimal(a).stripTrailingZeros().toPlainString());
+
+
+        System.out.println("+++++++" + convertPriceFromStr("0"));
     }
 
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/AuctionRecordServiceImpl.java

@@ -268,7 +268,7 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                 List<AuctionRecord> auctionRecordList = auctionRecordDao.findByItemId(itemId);
                 //查询商品竞拍信息
                 AuctionConfig auctionConfig = auctionConfigDao.findByItemId(dto.getItemId());
-                //最新出价记录
+                //当前拍品价格
                 AuctionRecord lastedRecord = auctionRecordList.get(0);
                 auctionRecordVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(lastedRecord.getPrice()));
                 if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
@@ -290,7 +290,28 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                 Date realEndTime = auctionConfig.getRealEndTime();
                 auctionRecordVo.setStartTime(startTime);
                 auctionRecordVo.setRealEndTime(realEndTime);
+                //出价记录对应展示的按钮
+                if (CollectionUtils.isEmpty(auctionRecordList)) {
+                    auctionRecordVo.setUserState(DistributionEnum.AuctionUserStateEnum.PROCESS.getCode());
+                    auctionRecordVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PROCESS.getDes());
+                }
                 if (now.after(realEndTime)) {
+                    //如果最高价是自己出的，用户状态显示已领先
+                    if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
+                        DistributionOrder distributionOrder = distributionOrderDao.findByItemId(itemId);
+                        //竞拍结束后未生成订单
+                        if (distributionOrder == null || distributionOrder.getPayTime() == null) {
+                            auctionRecordVo.setUserState(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getCode());
+                            auctionRecordVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getDes());
+                        } else {
+                            //竞拍结束页生成了订单并支付过了就显示竞拍结束
+                            auctionRecordVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode());
+                            auctionRecordVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes());
+                        }
+                    } else {
+                        auctionRecordVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode());
+                        auctionRecordVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes());
+                    }
                     auctionRecordVo.setState(DistributionEnum.AuctionStateEnum.END.getCode());
                     auctionRecordVo.setStateName(DistributionEnum.AuctionStateEnum.END.getDes());
                 } else {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -358,7 +358,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             if (CollectionUtils.isEmpty(auctionRecordList)) {
                 auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.PROCESS.getCode());
                 auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PROCESS.getDes());
-                auctionDetailVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
+                auctionDetailVo.setCurrentPrice("0");
             } else {
                 auctionDetailVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(lastedRecord.getPrice()));
                 //如果最高价是自己出的，用户状态显示已领先

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/AuctionRecordService.java

@@ -13,7 +13,7 @@ public interface AuctionRecordService {
     Result createAuctionRecord(AuctionRecordRequestDto dto);
 
     /**
-     * 查询出价记录
+     * 查询用户所有商品的出价记录
      * @param dto
      * @return
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/AuctionRecordController.java

@@ -31,7 +31,7 @@ public class AuctionRecordController {
     @PostMapping("/findList")
     public Result findList(@RequestBody AuctionRecordRequestDto dto) {
         logger.info("查询出价记录,请求参数:{}", JSON.toJSONString(dto));
-        if (dto.getItemId() == null || dto.getUserId() == null) {
+        if (dto.getUserId() == null) {
             return Result.failed(ResultCode.PARAM_ERROR);
         }
         return auctionRecordService.findList(dto);