From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 240 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 137 insertions(+), 103 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 36d8d92..0bad0c1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -410,6 +410,9 @@
//总优惠金额
BigDecimal activityAmount = BigDecimal.ZERO;
+
+ BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
+ confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
//减去优惠券优惠金额
CouponInfoVo couponInfoVo = null;
if(null != confirmOrder.getCouponId() && 2 != confirmOrder.getPaymentType()){
@@ -480,29 +483,35 @@
//查询当前是否有订单活动
List<OrderActivityInfo> orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
//满XX才打折，只有现金才能优惠
- if(null != orderActivityInfo && confirmOrder.getPaymentType() == 1){
+ if((confirmOrderVo.getUseSimultaneously() || (!confirmOrderVo.getUseSimultaneously() && activityAmount.equals(BigDecimal.ZERO)))
+ && null != orderActivityInfo && confirmOrder.getPaymentType() == 1){
+ BigDecimal zyh = BigDecimal.ZERO;
+ OrderActivityInfo activityInfo1 = null;
for (OrderActivityInfo activityInfo : orderActivityInfo) {
if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
- confirmOrderVo.setActivityName(activityInfo.getActivityName());
//优惠后的支付金额
BigDecimal multiply = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
//优惠金额
BigDecimal bigDecimal = paymentMoney.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN);
- paymentMoney = multiply;
- activityAmount = activityAmount.add(bigDecimal);
- break;
+ if(bigDecimal.compareTo(zyh) > 0){
+ zyh = bigDecimal;
+ activityInfo1 = activityInfo;
+ }
}
}
+ if(null != activityInfo1){
+ confirmOrderVo.setActivityName(activityInfo1.getActivityName());
+ paymentMoney = paymentMoney.subtract(zyh);
+ activityAmount = activityAmount.add(zyh);
+ }
}
confirmOrderVo.setDiscountAmount(activityAmount);
- BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
- confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
confirmOrderVo.setEarnPoint(earnPoint);
//支付金额，订单金额-订单优惠
confirmOrderVo.setPayMoney(paymentMoney);
- confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
+ confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
//获取默认收货地址
UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
if(null != userAddress){
@@ -759,9 +768,6 @@
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
}
- if(appUser.getLavePoint().intValue() < orderPoint){
- return R.fail("账户剩余积分不足");
- }
}
//现金的支付金额
BigDecimal paymentMoney = orderMoney;
@@ -854,17 +860,21 @@
OrderActivityInfo orderActivityInfo1 = null;
if((1 == status || null == shoppingCartPayment.getUserCouponId()) &&
null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3){
+ //找出最优会的金额
+ BigDecimal zyh = BigDecimal.ZERO;
for (OrderActivityInfo activityInfo : orderActivityInfo) {
if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
BigDecimal paymentMoney1 = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
- discount = activityInfo.getDiscount();
- paymentMoney = paymentMoney1;
- activityAmount = activityAmount.add(bigDecimal);
- orderActivityInfo1 = activityInfo;
- break;
+ if(bigDecimal.compareTo(zyh) > 0){
+ zyh = bigDecimal;
+ orderActivityInfo1 = activityInfo;
+ }
}
}
+
+ paymentMoney = paymentMoney.subtract(zyh);
+ activityAmount = activityAmount.add(zyh);
}
//可获得的消费积分
@@ -929,8 +939,9 @@
}
if(3 != shoppingCartPayment.getPaymentType() && (fullReductionAmount.compareTo(BigDecimal.ZERO) > 0 ||moneyAmount.compareTo(BigDecimal.ZERO) > 0 || discountAmount.compareTo(BigDecimal.ZERO) > 0)){
order.setCouponJson(JSON.toJSONString(couponInfoVo));
+ order.setUserCouponId(shoppingCartPayment.getUserCouponId());
}
- if(activityAmount.compareTo(BigDecimal.ZERO) > 0){
+ if(null != orderActivityInfo1){
order.setActivityJson(JSON.toJSONString(orderActivityInfo1));
}
if(null != shoppingCartPayment.getUserAddressId()){
@@ -954,7 +965,7 @@
if(3 == shoppingCartPayment.getPaymentType()){
Integer availablePoint = appUser.getAvailablePoint();
if(availablePoint < orderPoint){
- return R.fail("账户积分不足");
+ return R.fail("账户可用积分不足");
}
}
//判断运费支付是否足够
@@ -1007,6 +1018,10 @@
orderGood.setBoundShopPoints(myShoppingCartVo.getBoundShopPoints());
orderGood.setBoundShopSuperiorsCharges(myShoppingCartVo.getBoundShopSuperiorsCharges());
orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints());
+ orderGood.setCashPayment(myShoppingCartVo.getCashPayment() ? 1 : 0);
+ orderGood.setPointPayment(myShoppingCartVo.getPointPayment() ? 1 : 0);
+ orderGood.setSellingPrice(myShoppingCartVo.getCash());
+ orderGood.setIntegral(myShoppingCartVo.getPoint());
orderGoodService.save(orderGood);
}
@@ -1037,27 +1052,28 @@
BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
BigDecimal balance = appUser.getBalance();
//红包金额满足支付
- if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){
- totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney);
- balance = balance.subtract(paymentMoney);
+ BigDecimal paymentMoney1 = paymentMoney;
+ if(paymentMoney1.compareTo(totalRedPacketAmount) <= 0){
+ totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney1);
+ balance = balance.subtract(paymentMoney1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
- redPacketAmount = paymentMoney;
+ redPacketAmount = paymentMoney1;
}else{
- paymentMoney = paymentMoney.subtract(totalRedPacketAmount);
+ paymentMoney1 = paymentMoney1.subtract(totalRedPacketAmount);
redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
- if(paymentMoney.compareTo(totalDistributionAmount) <= 0){
- totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney);
- balance = balance.subtract(paymentMoney);
+ if(paymentMoney1.compareTo(totalDistributionAmount) <= 0){
+ totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
+ balance = balance.subtract(paymentMoney1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
- distributionAmount = paymentMoney;
+ distributionAmount = paymentMoney1;
}else{
- paymentMoney = paymentMoney.subtract(totalDistributionAmount);
+ paymentMoney1 = paymentMoney1.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
- balance = balance.subtract(paymentMoney);
+ balance = balance.subtract(paymentMoney1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
@@ -1076,8 +1092,13 @@
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("shopPoint", earnPoint);
+ jsonObject.put("availablePoint", earnPoint1);
if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
+ jsonObject.put("transferablePoint", earnPoint1);
}
if(earnPoint > 0){
@@ -1089,6 +1110,7 @@
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(order.getId());
+ userPoint.setExtention(jsonObject.toJSONString());
userPointClient.saveUserPoint(userPoint);
}
}
@@ -1116,6 +1138,15 @@
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
+ //处理优惠券
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ if(null != userCoupon && 1 == userCoupon.getStatus()){
+ userCoupon.setStatus(2);
+ userCoupon.setUseTime(LocalDateTime.now());
+ userCouponClient.editUserCoupon(userCoupon);
+ }
+ }
}
//积分支付
if(3 == shoppingCartPayment.getPaymentType()){
@@ -1148,8 +1179,9 @@
if(transferablePoint > 0){
tra = transferablePoint - orderPoint;
appUser.setTransferablePoint(tra >= 0 ? tra : 0);
+ }else{
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
}
- appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
//构建积分流水记录
UserPoint userPoint = new UserPoint();
@@ -1163,65 +1195,41 @@
userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
userPointClient.saveUserPoint(userPoint);
- lavePoint = appUser.getLavePoint();
- PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
- int earnPoint1 = 0;
- //计算可用积分比例
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
- appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
//变更等级
appUserClient.vipUpgrade(appUser.getId());
- //构建积分流水记录
- if(earnPoint > 0){
- userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(earnPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- }
+ //积分支付不返佣
+
//如果有运费，需要先扣除账户积分，再进行支付。支付成功后修改订单状态，未支付成功则回退积分，删除的订单
if(expressFee.compareTo(BigDecimal.ZERO) > 0){
if(shoppingCartPayment.getFreightPaymentType() == 2){
BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount();
BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
BigDecimal balance = appUser.getBalance();
- if(expressFee.compareTo(totalRedPacketAmount) <= 0){
- totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee);
- balance = balance.subtract(expressFee);
+ BigDecimal expressFee1 = expressFee;
+ if(expressFee1.compareTo(totalRedPacketAmount) <= 0){
+ totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee1);
+ balance = balance.subtract(expressFee1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
- redPacketAmount = expressFee;
+ redPacketAmount = expressFee1;
}else{
- expressFee = expressFee.subtract(totalRedPacketAmount);
+ expressFee1 = expressFee1.subtract(totalRedPacketAmount);
redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
- if(expressFee.compareTo(totalDistributionAmount) <= 0){
- totalDistributionAmount = totalDistributionAmount.subtract(expressFee);
- balance = balance.subtract(expressFee);
+ if(expressFee1.compareTo(totalDistributionAmount) <= 0){
+ totalDistributionAmount = totalDistributionAmount.subtract(expressFee1);
+ balance = balance.subtract(expressFee1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
- distributionAmount = expressFee;
+ distributionAmount = expressFee1;
}else{
- expressFee = expressFee.subtract(totalDistributionAmount);
+ expressFee1 = expressFee1.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
- balance = balance.subtract(expressFee);
+ balance = balance.subtract(expressFee1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
@@ -1235,8 +1243,8 @@
balanceChangeRecord.setAppUserId(appUser.getId());
balanceChangeRecord.setOrderId(order.getId());
balanceChangeRecord.setChangeType(5);
- balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney));
- balanceChangeRecord.setChangeAmount(paymentMoney);
+ balanceChangeRecord.setBeforeAmount(balance.add(expressFee));
+ balanceChangeRecord.setChangeAmount(expressFee);
balanceChangeRecord.setAfterAmount(balance);
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
@@ -1261,6 +1269,7 @@
this.removeBatchByIds(ids);
}
}
+
//添加账户余额支付明细
if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){
OrderBalancePayment orderBalancePayment = new OrderBalancePayment();
@@ -1295,31 +1304,39 @@
}
Integer earnPoint = order.getGetPoint();
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+ Integer lavePoint = appUser.getLavePoint();
BigDecimal paymentMoney = order.getPaymentAmount();
//构建积分流水记录
if(earnPoint > 0){
PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
- int earnPoint1 = earnPoint;
+ int earnPoint1 = 0;
if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(earnPoint1).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
}
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
-
- if(earnPoint > 0){
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
- userPoint.setVariablePoint(earnPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("shopPoint", earnPoint);
+ jsonObject.put("availablePoint", earnPoint1);
+ if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
+ jsonObject.put("transferablePoint", earnPoint1);
}
+
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(earnPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention(jsonObject.toJSONString());
+ userPointClient.saveUserPoint(userPoint);
}
appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
@@ -1333,6 +1350,17 @@
order.setOrderStatus(2);
}
orderService.updateById(order);
+
+ //处理优惠券
+ if(null != order.getUserCouponId()){
+ UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+ if(null != userCoupon && 1 == userCoupon.getStatus()){
+ userCoupon.setStatus(2);
+ userCoupon.setUseTime(LocalDateTime.now());
+ userCouponClient.editUserCoupon(userCoupon);
+ }
+ }
+
//删除购物车数据
Long userid = tokenService.getLoginUserApplet().getUserid();
List<OrderGood> list = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
@@ -1355,35 +1383,41 @@
if(null == order || order.getPayStatus() == 2){
return R.ok();
}
- Integer earnPoint = order.getGetPoint();
+ Integer orderPoint = order.getPoint();
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+
Integer lavePoint = appUser.getLavePoint();
- PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
- int earnPoint1 = 0;
- //计算可用积分比例
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ //扣减订单支付积分
+ appUser.setLavePoint(appUser.getLavePoint() - orderPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - orderPoint);
+ //可转增积分
+ Integer transferablePoint = appUser.getTransferablePoint();
+ Integer tra = 0;
+ if(transferablePoint > 0){
+ tra = transferablePoint - orderPoint;
+ appUser.setTransferablePoint(tra >= 0 ? tra : 0);
+ }else{
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
}
- appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
- appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
- appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
- appUser.setLastShopTime(LocalDateTime.now());
- appUserClient.editAppUserById(appUser);
- //变更等级
- appUserClient.vipUpgrade(appUser.getId());
-
+
//构建积分流水记录
UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
+ userPoint.setType(11);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(earnPoint);
+ userPoint.setVariablePoint(orderPoint);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(order.getId());
+ userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
userPointClient.saveUserPoint(userPoint);
+
+ //积分支付不反积分
+
+ appUser.setLastShopTime(LocalDateTime.now());
+ appUserClient.editAppUserById(appUser);
+ //变更等级
+ appUserClient.vipUpgrade(appUser.getId());
//修改订支付状态
order.setPayStatus(2);
@@ -1408,7 +1442,7 @@
public void closeOrder() {
//订单支付数据
long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
- Set<String> orderPayment = redisTemplate.opsForZSet().range("OrderPayment", 0, second);
+ Set<String> orderPayment = redisTemplate.opsForZSet().rangeByScore("OrderPayment", 0, second);
if(orderPayment.size() > 0){
List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, orderPayment));
for (Order order : list) {
@@ -1428,7 +1462,7 @@
}
//快递支付
- Set<String> materialFlowPayment = redisTemplate.opsForZSet().range("MaterialFlowPayment", 0, second);
+ Set<String> materialFlowPayment = redisTemplate.opsForZSet().rangeByScore("MaterialFlowPayment", 0, second);
if(materialFlowPayment.size() > 0){
materialFlowPayment.forEach(s->s.substring(1));
List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, materialFlowPayment));
--
Gitblit v1.7.1