ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -42,7 +42,7 @@ @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束") @JsonInclude(JsonInclude.Include.ALWAYS) private AuctionGoodsStatusEnum goodsSkustatus; private Integer goodsSkustatus; @ApiModelProperty(value = "拍卖时间（分钟）") @JsonInclude(JsonInclude.Include.ALWAYS) ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -122,7 +122,7 @@ .getData(); forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getId()); forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode()); forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice()); forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock()); forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration()); @@ -203,7 +203,7 @@ currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods.getId()); currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic()); currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime()); currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus()); currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode()); currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration()); auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); list.add(auctionSalesroomGoods.getSortNum()); @@ -231,7 +231,7 @@ currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getId()); currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic()); currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime()); currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus()); currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus().getCode()); currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration()); auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods); wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum()); @@ -250,7 +250,7 @@ GoodsSku goodsSku1=goodsSkuOne1.getData(); nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName()); nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic()); nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus()); nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus().getCode()); nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getId()); auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods); } @@ -270,7 +270,7 @@ forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName()); forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic()); forepartAuctionSalesroomGoodsVO1.setGoodsSkuId(salesroomGoods.getId()); forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus()); forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus().getCode()); auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1); }
@@ -451,7 +451,7 @@ forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic()); forepartAuctionSalesroomGoodsVO.setStartingPrice(salesroomGoods.getStartingPrice()); forepartAuctionSalesroomGoodsVO.setSalesroomStock(salesroomGoods.getSalesroomStock()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus()); forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus().getCode()); forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears())); forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec()); forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit()); @@ -679,48 +679,50 @@ throw new ServiceException("出价不能比每次最少加价低"); } LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery(); /* wrapper1.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId());*/ wrapper1.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId()); wrapper1.eq(AuctionBidRecord::getDelFlag,0); wrapper1.orderByDesc(AuctionBidRecord::getLastBidAmount); wrapper1.last("limit 1"); AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1); if (one!=null){ BigDecimal bigDecimal1=one.getLastBidAmount().add(byId.getMinimumMarkupAmount()); if (bigDecimal1.doubleValue()>bidVO.getLastBidAmount().doubleValue()){ throw new ServiceException("出价不能比上次出价加每次最少加价低"); if (byId.getAuctionStock()==1) { if (one != null) { BigDecimal bigDecimal1 = one.getLastBidAmount().add(byId.getMinimumMarkupAmount()); if (bigDecimal1.doubleValue() > bidVO.getLastBidAmount().doubleValue()) { throw new ServiceException("出价不能比上次出价加每次最少加价低"); } } one.setLastBidAmount(bidVO.getLastBidAmount()); one.setLastBidTime(LocalDateTime.now()); one.setBidCount(one.getBidCount()+1); auctionBidRecordService.updateById(one); }else{ one=new AuctionBidRecord(); one.setAuctionSalesroomId(bidVO.getAuctionSalesroomId()); one.setTargetId(bidVO.getTargetId()); one.setMemberId(bidVO.getMemberId()); one.setLastBidTime(LocalDateTime.now()); one.setAuctionType(AuctionOrderTypeEnum.REGULAR_ITEMS); one.setStatus(BidStatusEnum.ELIMINATE); one.setBidCount(1); one.setLastBidAmount(bidVO.getLastBidAmount()); auctionBidRecordService.save(one); } LambdaQueryWrapper<AuctionBidRecord> wrapper2=Wrappers.lambdaQuery(); wrapper2.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId()); wrapper2.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId()); wrapper2.eq(AuctionBidRecord::getDelFlag,0); wrapper2.orderByDesc(AuctionBidRecord::getLastBidAmount); AuctionBidRecord one2 = auctionBidRecordService.getOne(wrapper1); LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery(); wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId()); wrapper3.eq(AuctionBidRecord::getDelFlag,0); wrapper3.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId()); wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount); wrapper3.last("limit 1"); AuctionBidRecord one3 = auctionBidRecordService.getOne(wrapper3); if (one3!=null){ one3.setLastBidAmount(bidVO.getLastBidAmount()); one3.setLastBidTime(LocalDateTime.now()); one3.setBidCount(one.getBidCount()+1); auctionBidRecordService.updateById(one3); }else{ one3=new AuctionBidRecord(); one3.setAuctionSalesroomId(bidVO.getAuctionSalesroomId()); one3.setTargetId(bidVO.getTargetId()); one3.setMemberId(bidVO.getMemberId()); one3.setLastBidTime(LocalDateTime.now()); one3.setAuctionType(AuctionOrderTypeEnum.REGULAR_ITEMS); one3.setStatus(BidStatusEnum.ELIMINATE); one3.setBidCount(1); one3.setLastBidAmount(bidVO.getLastBidAmount()); auctionBidRecordService.save(one3); } Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); map.put("auctionSalesroomId", byId.getId()); map.put("byId", byId.getStartStatus()); map.put("lastBidAmount",one2.getLastBidAmount()); map.put("lastBidAmount",one.getLastBidAmount()); map.put("message_type", "BidRecor"); map.put("type",4); String msg = null; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -65,6 +65,11 @@ private MemberClient memberClient; @Override public void saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) { List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId(); if (memberInvoiceOrderList.size()==0){ throw new ServiceException("无开票订单"); } MemberInvoice memberInvoice =new MemberInvoice(); memberInvoice.setMemberId(memberInvoiceDTO.getMemberId()); memberInvoice.setInvoiceMoney(memberInvoiceDTO.getInvoiceMoney()); @@ -78,14 +83,12 @@ memberInvoice.setCorporationPhone(memberInvoiceDTO.getCorporationPhone()); memberInvoice.setCorporationOpen(memberInvoiceDTO.getCorporationOpen()); memberInvoice.setRiseType(memberInvoiceDTO.getRiseType()); BigDecimal pice=new BigDecimal(0.0); this.save(memberInvoice); List<Long> memberInvoiceOrderList=memberInvoiceDTO.getOrderId(); for (Long memberInvoiceOrder:memberInvoiceOrderList){ Double pice=0.00; for (int i=0;i<memberInvoiceOrderList.size();i++){ MemberInvoiceOrder memberInvoiceOrder1=new MemberInvoiceOrder(); Order order= iOrderService.getById(memberInvoiceOrder); order.setInvoiceStatus(1); Order order= iOrderService.getById(memberInvoiceOrderList.get(i)); order.setInvoiceStatus(2); iOrderService.updateById(order); memberInvoiceOrder1.setInvoiceId(memberInvoice.getId()); memberInvoiceOrder1.setOrderMoney(order.getTotalAmount()); @@ -94,9 +97,10 @@ OrderName=order.getSkuName(); memberInvoiceOrder1.setOrderName(OrderName); iMemberInvoiceOrderService.save(memberInvoiceOrder1); pice.add(order.getTotalAmount()); pice=pice+order.getTotalAmount().doubleValue(); } memberInvoice.setInvoiceMoney(pice); memberInvoice.setInvoiceMoney(new BigDecimal(pice)); this.updateById(memberInvoice); }
@@ -736,6 +736,14 @@ order.setCancelTime(LocalDateTime.now()); baseMapper.updateById(order); if (order.getCouponId()!=0){ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO(); couponMemberDTO1.setId(order.getCouponId()); couponMemberDTO1.setCouponStatus(0); promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER); } updMembeOneDTO MembeOneDTO = new updMembeOneDTO(); MembeOneDTO.setType(2); MembeOneDTO.setMemberId(order.getMemberId()); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -96,7 +96,13 @@ wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO); wrapper1.eq(OrderAuctionBond::getDelFlag,0); OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1); one1.setBoundStatus(BondStatusEnum.PAID); if (one1.getBond().compareTo(new BigDecimal(0))==0){ one1.setBoundStatus(BondStatusEnum.PAID); Map<String, Object> returnMap = new HashMap<>(); returnMap.put("Type",1); return R.ok(returnMap); } }else{ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery(); @@ -107,8 +113,9 @@ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED); page1.setPayTime(LocalDateTime.now()); OrderMapper.updateById(page1); Map<String, Object> returnMap = new HashMap<>(20); Map<String, Object> returnMap = new HashMap<>(); returnMap.put("Type",1); return R.ok(returnMap); } page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED); @@ -121,6 +128,7 @@ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE); memberPointsDTO.setPoints(page1.getPoints()); memberClient.addMemberPoints(memberPointsDTO); updMembeOneDTO MembeOneDTO=new updMembeOneDTO(); MembeOneDTO.setType(1); MembeOneDTO.setMemberId(page1.getMemberId()); @@ -140,7 +148,7 @@ if (type == 1) { // 支付宝预下单 return this.alipay(orderNO, subject, body, price, request); } else { } if (type == 2){ // 微信预下单 return this.wxpay(2, orderNO, body, openId, price, request); } @@ -156,7 +164,7 @@ if (type == 1) { // 支付宝预下单 return this.alipay(orderNO, subject, body, price, request); } else { } if (type == 2) { // 微信预下单 return this.wxpay(2, orderNO, body,openId, price, request); }
