From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 26 十二月 2024 17:16:19 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 887 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 773 insertions(+), 114 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 a3e1a00..c04e268 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 @@ -5,91 +5,113 @@ import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.account.api.feignClient.AppUserClient; -import com.ruoyi.account.api.feignClient.UserAddressClient; -import com.ruoyi.account.api.feignClient.UserCouponClient; -import com.ruoyi.account.api.model.AppUser; -import com.ruoyi.account.api.model.UserAddress; +import com.ruoyi.account.api.feignClient.*; +import com.ruoyi.account.api.model.*; import com.ruoyi.account.api.vo.CouponInfoVo; import com.ruoyi.account.api.vo.PaymentUserCoupon; +import com.ruoyi.account.api.vo.PaymentUserCouponVo; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.mapper.ShoppingCartMapper; -import com.ruoyi.order.service.OrderGoodService; -import com.ruoyi.order.service.OrderService; -import com.ruoyi.order.service.ShoppingCartService; +import com.ruoyi.order.model.Order; +import com.ruoyi.order.model.OrderBalancePayment; +import com.ruoyi.order.model.OrderGood; +import com.ruoyi.order.model.ShoppingCart; +import com.ruoyi.order.service.*; import com.ruoyi.order.vo.*; import com.ruoyi.other.api.domain.*; import com.ruoyi.other.api.feignClient.*; import com.ruoyi.other.api.vo.GetGoodsBargainPrice; +import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds; import com.ruoyi.other.api.vo.GetSeckillActivityInfo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import model.Order; -import model.OrderGood; -import model.ShoppingCart; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.util.*; import java.util.stream.Collectors; @Service public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService { - + @Resource private TokenService tokenService; - + @Resource private GoodsClient goodsClient; - + @Resource private GoodsShopClient goodsShopClient; - + @Resource private AppUserClient appUserClient; - + @Resource private GoodsAreaClient goodsAreaClient; - + @Resource private GoodsVipClient goodsVipClient; - + @Resource private SeckillActivityInfoClient seckillActivityInfoClient; - + @Resource private GoodsBargainPriceClient goodsBargainPriceClient; - + @Resource private OrderService orderService; - + @Resource private OrderGoodService orderGoodService; - + @Resource private ShopClient shopClient; - + @Resource private OrderActivityInfoClient orderActivityInfoClient; - + @Resource private BaseSettingClient baseSettingClient; - + @Resource private UserAddressClient userAddressClient; - + @Resource private UserCouponClient userCouponClient; - + @Resource private SystemConfigClient systemConfigClient; + + @Resource + private UserPointClient userPointClient; + + @Resource + private BalanceChangeRecordClient balanceChangeRecordClient; + + @Resource + private CommissionService commissionService; + + @Resource + private VipSettingClient vipSettingClient; + + @Resource + private UserChangeLogClient userChangeLogClient; + + + + + + + + @Resource + private PointSettingClient pointSettingClient; + + @Resource + private OrderBalancePaymentService orderBalancePaymentService; @@ -111,15 +133,15 @@ if(null == data){ throw new RuntimeException("根据类型(1=服务商品,2=单品商品)获取商品数据失败"); } - List<Long> goodsIds = data.stream().map(Goods::getId).collect(Collectors.toList()); + List<Integer> goodsIds = data.stream().map(Goods::getId).collect(Collectors.toList()); //查询符合商品类型的商品数据 List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds)); //构建返回数据 List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null); return page; } - - + + /** * 获取支付价格 * @param appUser @@ -141,8 +163,11 @@ GetGoodsBargainPrice goodsBargainPrice = new GetGoodsBargainPrice(); goodsBargainPrice.setGoodsId(goodsId); goodsBargainPrice.setVip(appUser.getVipId()); - goodsBargainPrice.setShopId(shopId); - GoodsBargainPriceDetail bargainPriceDetail = goodsBargainPriceClient.getGoodsBargainPrice(goodsBargainPrice).getData(); + GoodsBargainPriceDetail bargainPriceDetail = null; + if (shopId != null){ + goodsBargainPrice.setShopId(shopId); + bargainPriceDetail = goodsBargainPriceClient.getGoodsBargainPrice(goodsBargainPrice).getData(); + } if(null == bargainPriceDetail){ //没有门店特价,判断地区价格配置 GoodsArea area = new GoodsArea(); @@ -153,29 +178,49 @@ GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData(); if(null == goodsArea){ //没有地区价格,则使用会员价格 - GoodsVip goodsVip = goodsVipClient.getGoodsVip(appUser.getVipId()).getData(); + GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData(); if(null == goodsVip){ //没有配置价格,直接使用原始基础价格 return null; }else{ price.setCash(goodsVip.getSellingPrice()); price.setPoint(goodsVip.getIntegral()); - price.setCashPayment(goodsVip.getCashPayment() == 1 ? true : false); - price.setPointPayment(goodsVip.getPointPayment() == 1 ? true : false); + price.setCashPayment(goodsVip.getCashPayment() == 1); + price.setPointPayment(goodsVip.getPointPayment() == 1); price.setEarnSpendingPoints(goodsVip.getEarnSpendingPoints()); + price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission()); + price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints()); + price.setSuperiorType(goodsVip.getSuperiorType()); + price.setServuceShopCharges(goodsVip.getServuceShopCharges()); + price.setServuceShopPoints(goodsVip.getServuceShopPoints()); + price.setTechnicianPoints(goodsVip.getTechnicianPoints()); + price.setBoundShopCharges(goodsVip.getBoundShopCharges()); + price.setBoundShopPoints(goodsVip.getBoundShopPoints()); + price.setBoundShopSuperiorsCharges(goodsVip.getBoundShopSuperiorsCharges()); + price.setBoundShopSuperiorsPoints(goodsVip.getBoundShopSuperiorsPoints()); } }else{ price.setCash(goodsArea.getSellingPrice()); price.setPoint(goodsArea.getIntegral()); - price.setCashPayment(goodsArea.getCashPayment() == 1 ? true : false); - price.setPointPayment(goodsArea.getPointPayment() == 1 ? true : false); + price.setCashPayment(goodsArea.getCashPayment() == 1); + price.setPointPayment(goodsArea.getPointPayment() == 1); price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints()); + price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission()); + price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints()); + price.setSuperiorType(goodsArea.getSuperiorType()); + price.setServuceShopCharges(goodsArea.getServuceShopCharges()); + price.setServuceShopPoints(goodsArea.getServuceShopPoints()); + price.setTechnicianPoints(goodsArea.getTechnicianPoints()); + price.setBoundShopCharges(goodsArea.getBoundShopCharges()); + price.setBoundShopPoints(goodsArea.getBoundShopPoints()); + price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges()); + price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints()); } }else{ price.setCash(bargainPriceDetail.getSellingPrice()); price.setPoint(bargainPriceDetail.getIntegral()); - price.setCashPayment(bargainPriceDetail.getSellingPrice() != null ? true : false); - price.setPointPayment(bargainPriceDetail.getIntegral() != null ? true : false); + price.setCashPayment(bargainPriceDetail.getSellingPrice() != null); + price.setPointPayment(bargainPriceDetail.getIntegral() != null); //门店特价,消费积分使用会员等级的消费积分 GoodsArea area = new GoodsArea(); area.setDistrictsCode(appUser.getDistrictCode()); @@ -184,6 +229,16 @@ area.setVip(appUser.getVipId()); GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData(); price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints()); + price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission()); + price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints()); + price.setSuperiorType(goodsArea.getSuperiorType()); + price.setServuceShopCharges(goodsArea.getServuceShopCharges()); + price.setServuceShopPoints(goodsArea.getServuceShopPoints()); + price.setTechnicianPoints(goodsArea.getTechnicianPoints()); + price.setBoundShopCharges(goodsArea.getBoundShopCharges()); + price.setBoundShopPoints(goodsArea.getBoundShopPoints()); + price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges()); + price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints()); } }else{ //构建价格数据 @@ -197,52 +252,36 @@ if(goodsSeckill.getCashPayment() == 0 && goodsSeckill.getPointPayment() == 1){ price.setPoint(goodsSeckill.getIntegral()); } - price.setCashPayment(goodsSeckill.getCashPayment() == 1 ? true : false); - price.setPointPayment(goodsSeckill.getPointPayment() == 1 ? true : false); + price.setCashPayment(goodsSeckill.getCashPayment() == 1); + price.setPointPayment(goodsSeckill.getPointPayment() == 1); price.setEndTime(goodsSeckill.getEndTime()); price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints()); + price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission()); + price.setSuperiorRebatePoints(goodsSeckill.getSuperiorRebatePoints()); + price.setSuperiorType(goodsSeckill.getSuperiorType()); + price.setServuceShopCharges(goodsSeckill.getServuceShopCharges()); + price.setServuceShopPoints(goodsSeckill.getServuceShopPoints()); + price.setTechnicianPoints(goodsSeckill.getTechnicianPoints()); + price.setBoundShopCharges(goodsSeckill.getBoundShopCharges()); + price.setBoundShopPoints(goodsSeckill.getBoundShopPoints()); + price.setBoundShopSuperiorsCharges(goodsSeckill.getBoundShopSuperiorsCharges()); + price.setBoundShopSuperiorsPoints(goodsSeckill.getBoundShopSuperiorsPoints()); } return price; } - - - @Data - class Price { - /** - * 现金 - */ - private BigDecimal cash; - /** - * 积分 - */ - private Integer point; - /** - * 获取结束时间 - */ - private Long endTime; - /** - * 现金支付 - */ - private Boolean cashPayment; - /** - * 积分支付 - */ - private Boolean pointPayment; - /** - * 可获得消费积分 - */ - private Integer earnSpendingPoints; - } - + + + @Override - public void addGoods(ShoppingCart shoppingCart) { + public Long addGoods(ShoppingCart shoppingCart) { Long userid = tokenService.getLoginUserApplet().getUserid(); shoppingCart.setAppUserId(userid); this.save(shoppingCart); + return shoppingCart.getId(); } - - + + /** * 修改购物车数量 * @param setGoodsNumber @@ -254,18 +293,21 @@ return R.fail("修改数量不能小于等于0"); } ShoppingCart shoppingCart = this.getById(setGoodsNumber.getId()); - Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData(); - if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && goods.getPurchaseLimit() < setGoodsNumber.getNumber()){ - return R.fail("修改数量不能大于限购数量"); - } + if(null != shoppingCart){ + + Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData(); + if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && goods.getPurchaseLimit() < setGoodsNumber.getNumber()){ + return R.fail("修改数量不能大于限购数量"); + } + shoppingCart.setNumber(setGoodsNumber.getNumber()); this.updateById(shoppingCart); } return R.ok(); } - - + + /** * 确认购物车订单 * @param confirmOrder @@ -273,7 +315,22 @@ */ @Override public ConfirmOrderVo confirmOrder(ConfirmOrder confirmOrder) { + Integer position = confirmOrder.getPosition(); Long userid = tokenService.getLoginUserApplet().getUserid(); + //直接购买商品 + if(2 == position){ + //先加入购物车 + String goodsJson = confirmOrder.getGoodsJson(); + JSONArray objects = JSON.parseArray(goodsJson); + Long id = objects.getJSONObject(0).getLong("id"); + Integer num1 = objects.getJSONObject(0).getInteger("num"); + ShoppingCart shoppingCart = new ShoppingCart(); + shoppingCart.setAppUserId(userid); + shoppingCart.setGoodsId(id.intValue()); + shoppingCart.setNumber(num1); + Long shoppingCarId = addGoods(shoppingCart); + confirmOrder.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]"); + } AppUser appUser = appUserClient.getAppUserById(userid); Integer shopId = confirmOrder.getShopId(); Shop shop = shopClient.getShopById(shopId).getData(); @@ -310,7 +367,7 @@ confirmOrderVo.setDiscountAmount(orderMoney.subtract(paymentMoney).setScale(2, RoundingMode.HALF_EVEN)); } BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData(); - confirmOrderVo.setUseSimultaneously(baseSetting.getContent().equals("1") ? true : false); + confirmOrderVo.setUseSimultaneously(baseSetting.getContent().equals("1")); int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum(); confirmOrderVo.setEarnPoint(earnPoint); //支付金额,订单金额-订单优惠 @@ -318,31 +375,70 @@ confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue()); //获取默认收货地址 UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData(); - confirmOrderVo.setUserAddress(userAddress); + if(null != userAddress){ + userAddress.setIdStr(userAddress.getId().toString()); + confirmOrderVo.setUserAddress(userAddress); + } confirmOrderVo.setPaymentType(confirmOrder.getPaymentType()); //获取用户优惠券,用户全部优惠券,不能使用的需要标识出来置灰展示 PaymentUserCoupon paymentUserCoupon = new PaymentUserCoupon(); paymentUserCoupon.setUserId(userid); paymentUserCoupon.setOrderMoney(orderMoney); paymentUserCoupon.setType(confirmOrder.getType()); - List<CouponInfoVo> data = userCouponClient.getPaymentUserCoupon(paymentUserCoupon).getData(); - confirmOrderVo.setCoupon(data); + if(confirmOrder.getPaymentType() == 1){ + List<PaymentUserCouponVo> data = userCouponClient.getPaymentUserCoupon(paymentUserCoupon).getData(); + if(null != data){ + for (PaymentUserCouponVo couponInfo : data) { + List<Integer> forGoodIds = couponInfo.getForGoodIds(); + //全部商品适用 + if(null == forGoodIds){ + //满减券 + if(1 == couponInfo.getCouponType() && orderMoney.compareTo(couponInfo.getConditionAmount()) >= 0){ + couponInfo.setAvailable(true); + } + //代金券和折扣券 + if(2 == couponInfo.getCouponType() || 3 == couponInfo.getCouponType()){ + couponInfo.setAvailable(true); + } + }else{ + //部分商品适用 + BigDecimal goodsMoney = BigDecimal.ZERO; + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + Integer goodsId = myShoppingCartVo.getGoodsId(); + BigDecimal cash = myShoppingCartVo.getCash(); + if(forGoodIds.contains(goodsId)){ + goodsMoney = goodsMoney.add(cash); + } + } + //满减 + if(1 == couponInfo.getCouponType() && couponInfo.getConditionAmount().compareTo(goodsMoney) <= 0){ + couponInfo.setAvailable(true); + } + //代金券 + if(2 == couponInfo.getCouponType() || 3 == couponInfo.getCouponType()){ + couponInfo.setAvailable(true); + } + } + } + } + confirmOrderVo.setCoupon(data); + } //获取快递策略 SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData(); JSONObject jsonObject = JSON.parseObject(systemConfig.getContent()); - confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("expressFee")); - List<Integer> vip = jsonObject.getJSONArray("vip").toList(Integer.class); + confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("freight")); + List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(",")); //包邮条件(所有会员或者满足条件的会员) - if(vip.get(0) == -1 || vip.contains(appUser.getVipId())){ + if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){ if(confirmOrder.getPaymentType() == 1){ //现金支付,支付金额满足包邮条件 - BigDecimal cash = jsonObject.getBigDecimal("cash"); + BigDecimal cash = jsonObject.getBigDecimal("freeFreight"); if(confirmOrderVo.getPayMoney().compareTo(cash) >= 0){ confirmOrderVo.setExpressFee(BigDecimal.ZERO); } }else{ //积分支付,支付积分是否满足包邮条件 - Integer point = jsonObject.getInteger("point"); + Integer point = jsonObject.getInteger("freeIntegral"); if(confirmOrderVo.getOrderPoint().compareTo(point) >= 0){ confirmOrderVo.setExpressFee(BigDecimal.ZERO); } @@ -350,8 +446,8 @@ } return confirmOrderVo; } - - + + /** * 构建购物车商品列表 * @param appUser @@ -365,7 +461,8 @@ for (ShoppingCart shoppingCart : list) { Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData(); MyShoppingCartVo vo = new MyShoppingCartVo(); - vo.setId(shoppingCart.getId()); + vo.setId(shoppingCart.getId().toString()); + vo.setGoodsId(goods.getId()); vo.setHomePicture(goods.getHomePagePicture()); vo.setName(goods.getName()); int num = shoppingCart.getNumber(); @@ -381,11 +478,12 @@ //获取支付价格 Price price = getPrice(appUser, shoppingCart.getGoodsId(), shopId); if(null == price){ + price = new Price(); //使用商品的基础价格 price.setCash(1 == goods.getCashPayment() ? goods.getSellingPrice() : null); price.setPoint(1 == goods.getPointPayment() ? goods.getIntegral() : null); - price.setCashPayment(goods.getCashPayment() == 1 ? true : false); - price.setPointPayment(goods.getPointPayment() == 1 ? true : false); + price.setCashPayment(goods.getCashPayment() == 1); + price.setPointPayment(goods.getPointPayment() == 1); } vo.setCash(price.getCash()); vo.setPoint(price.getPoint()); @@ -398,7 +496,7 @@ goodsShop.setGoodsId(shoppingCart.getGoodsId()); goodsShop.setShopId(shopId); GoodsShop goodsShop1 = goodsShopClient.getGoodsShop(goodsShop).getData(); - vo.setVerifiable(null == goodsShop1 ? false : true); + vo.setVerifiable(goods.getAppointStore() != 1 || null != goodsShop1); //判断当前数量是否已经超出限购数量(需要计算已经购买的数量) if(null == goods.getPurchaseLimit() || -1 == goods.getPurchaseLimit()){ vo.setPurchaseLimit(false); @@ -406,21 +504,31 @@ List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(4, 8))); List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList()); int sum = 0; - if(orderIds.size() > 0){ + if(!orderIds.isEmpty()){ List<OrderGood> orderGoodList = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().in(OrderGood::getOrderId, orderIds) .eq(OrderGood::getGoodsId, shoppingCart.getGoodsId()).eq(OrderGood::getDelFlag, 0)); sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum(); } - vo.setPurchaseLimit((num + sum) > goods.getPurchaseLimit() ? true : false); + vo.setPurchaseLimit((num + sum) > goods.getPurchaseLimit()); } - vo.setEarnSpendingPoints(price.getEarnSpendingPoints()); vo.setDistributionMode(goods.getDistributionMode()); + vo.setEarnSpendingPoints(price.getEarnSpendingPoints()); + vo.setSuperiorSubcommission(price.getSuperiorSubcommission()); + vo.setSuperiorRebatePoints(price.getSuperiorRebatePoints()); + vo.setSuperiorType(price.getSuperiorType()); + vo.setServuceShopCharges(price.getServuceShopCharges()); + vo.setServuceShopPoints(price.getServuceShopPoints()); + vo.setTechnicianPoints(price.getTechnicianPoints()); + vo.setBoundShopCharges(price.getBoundShopCharges()); + vo.setBoundShopPoints(price.getBoundShopPoints()); + vo.setBoundShopSuperiorsCharges(price.getBoundShopSuperiorsCharges()); + vo.setBoundShopSuperiorsPoints(price.getBoundShopSuperiorsPoints()); page.add(vo); } return page; } - - + + /** * 购物车支付操作 * @param shoppingCartPayment @@ -431,22 +539,573 @@ Long userid = tokenService.getLoginUserApplet().getUserid(); AppUser appUser = appUserClient.getAppUserById(userid); Integer shopId = shoppingCartPayment.getShopId(); - Shop shop = shopClient.getShopById(shopId).getData(); String goodsJson = shoppingCartPayment.getGoodsJson(); List<Long> ids = new ArrayList<>(); + Integer num = 0; JSONArray objects = JSON.parseArray(goodsJson); for (int i = 0; i < objects.size(); i++) { Long id = objects.getJSONObject(i).getLong("id"); + Integer num1 = objects.getJSONObject(i).getInteger("num"); + num += num1; + ShoppingCart shoppingCart = this.getById(id); + //判断当前数量是否已经超出限购数量(需要计算已经购买的数量) + Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData(); + if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit()){ + List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(4, 8))); + List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList()); + int sum = 0; + if(orderIds.size() > 0){ + List<OrderGood> orderGoodList = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().in(OrderGood::getOrderId, orderIds) + .eq(OrderGood::getGoodsId, shoppingCart.getGoodsId()).eq(OrderGood::getDelFlag, 0)); + sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum(); + } + if((num1 + sum) > goods.getPurchaseLimit()){ + return R.fail(goods.getName() + "已超出购买上限"); + } + } ids.add(id); } + List<ShoppingCart> list = this.listByIds(ids); - ConfirmOrderVo confirmOrderVo = new ConfirmOrderVo(); //构建商品明细列表 List<MyShoppingCartVo> goodsList = buildDetail(appUser, shopId, list, objects); - - - - - return null; + //判断支付当时是否正确 + if(1 == shoppingCartPayment.getPaymentType() || 2 == shoppingCartPayment.getPaymentType()){ + //现金支付 + long count = goodsList.stream().filter(s -> s.getCashPayment()).count(); + if(count != goodsList.size()){ + return R.fail("支付方式不正确"); + } + } else if(3 == shoppingCartPayment.getPaymentType()){ + //积分支付 + long count = goodsList.stream().filter(s -> s.getPointPayment()).count(); + if(count != goodsList.size()){ + return R.fail("支付方式不正确"); + } + }else{ + return R.fail("支付方式不正确"); + } + //判断门店是都可以核销所有的商品 + List<Integer> goodsIds = goodsList.stream().map(MyShoppingCartVo::getGoodsId).collect(Collectors.toList()); + GetGoodsShopByGoodsIds goodsShopByGoodsIds = new GetGoodsShopByGoodsIds(); + goodsShopByGoodsIds.setGoodsIds(goodsIds); + goodsShopByGoodsIds.setShopId(shopId); + List<GoodsShop> data = goodsShopClient.getGoodsShopByGoodsIds(goodsShopByGoodsIds).getData(); + List<Integer> collect = data.stream().map(GoodsShop::getGoodsId).collect(Collectors.toList()); + if(data.size() != goodsList.size()){ + String goodsName = ""; + for (Integer goodsId : goodsIds) { + Goods goods = goodsClient.getGoodsById(goodsId).getData(); + if(1 == goods.getAppointStore() && !collect.contains(goodsId)){ + goodsName = goods.getName(); + break; + } + } + if(StringUtils.isNotEmpty(goodsName)){ + return R.fail(goodsName + "不能在该门店核销"); + } + } + //开始构建支付信息 + //现金支付的订单金额 + BigDecimal orderMoney = BigDecimal.ZERO; + //折扣(9折) + BigDecimal discount = null; + //积分支付的订单积分 + Integer orderPoint = 0; + if(3 != shoppingCartPayment.getPaymentType()){ + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + orderMoney = orderMoney.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()))); + } + }else{ + orderPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getPoint).sum(); + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber()); + } + if(appUser.getLavePoint().intValue() < orderPoint){ + return R.fail("账户剩余积分不足"); + } + } + //现金的支付金额 + BigDecimal paymentMoney = orderMoney; + //满减金额 + BigDecimal fullReductionAmount = BigDecimal.ZERO; + //代金券抵扣金额 + BigDecimal moneyAmount = BigDecimal.ZERO; + //折扣券抵扣金额 + BigDecimal discountAmount = BigDecimal.ZERO; + //活动优惠金额 + BigDecimal activityAmount = BigDecimal.ZERO; + + //减去优惠券优惠金额 + CouponInfoVo couponInfoVo = null; + if(null != shoppingCartPayment.getUserCouponId() && 3 != shoppingCartPayment.getPaymentType()){ + couponInfoVo = userCouponClient.getCouponInfo(shoppingCartPayment.getUserCouponId()).getData(); + String forGoodIds = couponInfoVo.getForGoodIds(); + List<Integer> parseArray = JSON.parseArray(forGoodIds, Integer.class); + //全部商品 + if(parseArray.contains(-1)){ + //满减 + if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(paymentMoney) <= 0){ + paymentMoney = paymentMoney.subtract(couponInfoVo.getDiscountAmount()); + fullReductionAmount = fullReductionAmount.add(couponInfoVo.getDiscountAmount()); + } + //代金券 + if(2 == couponInfoVo.getCouponType()){ + paymentMoney = paymentMoney.subtract(couponInfoVo.getMoneyAmount()); + moneyAmount = moneyAmount.add(couponInfoVo.getMoneyAmount()); + if(paymentMoney.compareTo(BigDecimal.ZERO) < 0){ + paymentMoney = BigDecimal.ZERO; + } + } + //折扣券 + if(3 == couponInfoVo.getCouponType()){ + BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney); + BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN); + discount = couponInfoVo.getDiscount(); + paymentMoney = paymentMoney1; + discountAmount = discountAmount.add(bigDecimal); + } + }else{ + //部分商品,需要计算参与优惠商品的支付金额,然后再对商品进行优惠券处理 + paymentMoney = BigDecimal.ZERO; + BigDecimal goodsMoney = BigDecimal.ZERO; + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + Integer goodsId = myShoppingCartVo.getGoodsId(); + BigDecimal cash = myShoppingCartVo.getCash(); + if(parseArray.contains(goodsId)){ + goodsMoney = goodsMoney.add(cash); + }else{ + paymentMoney = paymentMoney.add(cash); + } + } + + //满减 + if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(goodsMoney) <= 0){ + goodsMoney = goodsMoney.subtract(couponInfoVo.getDiscountAmount()); + fullReductionAmount = fullReductionAmount.add(couponInfoVo.getDiscountAmount()); + } + //代金券 + if(2 == couponInfoVo.getCouponType()){ + goodsMoney = goodsMoney.subtract(couponInfoVo.getMoneyAmount()); + moneyAmount = moneyAmount.add(couponInfoVo.getMoneyAmount()); + if(goodsMoney.compareTo(BigDecimal.ZERO) < 0){ + goodsMoney = BigDecimal.ZERO; + } + } + //折扣券 + if(3 == couponInfoVo.getCouponType()){ + BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(goodsMoney); + BigDecimal bigDecimal = goodsMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN); + discount = couponInfoVo.getDiscount(); + goodsMoney = paymentMoney1; + discountAmount = discountAmount.add(bigDecimal); + } + paymentMoney = paymentMoney.add(goodsMoney); + } + } + + //查询当前是否有订单活动 + OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData(); + BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData(); + //系统活动设置(优惠券和活动能否同时使用) + boolean useSimultaneously = baseSetting.getContent().equals("1"); + //满XX才打折,只有现金才能优惠 + //如果使用优惠券,则需要判断是否可以和同时使用,且活动满足使用条件。 + //没有使用优惠券,只需要判断是都满足使用条件 + if((useSimultaneously || null == shoppingCartPayment.getUserCouponId()) && + null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3 && orderActivityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){ + BigDecimal paymentMoney1 = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney); + BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN); + discount = orderActivityInfo.getDiscount(); + paymentMoney = paymentMoney1; + activityAmount = activityAmount.add(bigDecimal); + } + + //可获得的消费积分 + int earnPoint = 0; + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + earnPoint += (myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber()); + } + if(null != shoppingCartPayment.getUserAddressId()){ + userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData(); + } + + //获取快递策略,计算快递费 + BigDecimal expressFee = BigDecimal.ZERO; + if(null != shoppingCartPayment.getUserAddressId()){ + SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData(); + JSONObject jsonObject = JSON.parseObject(systemConfig.getContent()); + //快递费 + expressFee = jsonObject.getBigDecimal("freight"); + List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(",")); + //包邮条件(所有会员或者满足条件的会员) + if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){ + if(shoppingCartPayment.getPaymentType() != 3){ + //现金支付,支付金额满足包邮条件 + BigDecimal cash = jsonObject.getBigDecimal("freeFreight"); + if(paymentMoney.compareTo(cash) >= 0){ + expressFee = BigDecimal.ZERO; + } + }else{ + //积分支付,支付积分是否满足包邮条件 + Integer point = jsonObject.getInteger("freeIntegral"); + if(orderPoint.compareTo(point) >= 0){ + expressFee = BigDecimal.ZERO; + } + } + } + } + //构建订单明细 + Order order = new Order(); + order.setAppUserId(userid); + order.setNum(num); + String goodPics = ""; + String goodName = ""; + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + goodPics += myShoppingCartVo.getHomePicture() + ","; + goodName += myShoppingCartVo.getName() + ","; + } + order.setGoodPics(goodPics.substring(0, goodPics.length() - 1)); + order.setGoodName(goodName.substring(0, goodName.length() - 1)); + Goods goods = goodsClient.getGoodsById(goodsList.get(0).getGoodsId()).getData(); + order.setOrderType(goods.getType()); + order.setOrderStatus(goods.getType() == 1 ? 3 : 1); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + order.setOrderNumber("QJS" + getNumber(3) + sdf.format(new Date())); + order.setTotalAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN)); + order.setFullReductionAmount(fullReductionAmount); + order.setMoneyAmount(moneyAmount); + order.setDiscountAmount(discountAmount); + order.setActivityAmount(activityAmount); + order.setDiscountTotalAmount(fullReductionAmount.add(moneyAmount).add(discountAmount).add(activityAmount)); + order.setPaymentAmount(paymentMoney); + order.setPoint(orderPoint); + order.setPayMethod(shoppingCartPayment.getPaymentType()); + if(StringUtils.isNotEmpty(shoppingCartPayment.getExpectedDeliveryTime())){ + order.setExpectedDeliveryTime(shoppingCartPayment.getExpectedDeliveryTime()); + } + if(3 != shoppingCartPayment.getPaymentType() && (fullReductionAmount.compareTo(BigDecimal.ZERO) > 0 ||moneyAmount.compareTo(BigDecimal.ZERO) > 0 || discountAmount.compareTo(BigDecimal.ZERO) > 0)){ + order.setCouponJson(JSON.toJSONString(couponInfoVo)); + } + if(activityAmount.compareTo(BigDecimal.ZERO) > 0){ + order.setActivityJson(JSON.toJSONString(orderActivityInfo)); + } + if(null != shoppingCartPayment.getUserAddressId()){ + UserAddress address = userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData(); + order.setExpressAmount(expressFee); + order.setAddressJson(JSON.toJSONString(address)); + } + order.setGetPoint(earnPoint); + order.setPayStatus(1); + order.setShopId(shoppingCartPayment.getShopId()); + order.setDelFlag(0); + order.setCreateTime(LocalDateTime.now()); + order.setExpressPayMethod(shoppingCartPayment.getFreightPaymentType()); + + if(2 == shoppingCartPayment.getPaymentType()){ + BigDecimal balance = appUser.getBalance(); + if(balance.compareTo(paymentMoney) < 0){ + return R.fail("账户余额不足"); + } + } + //判断运费支付是否足够 + if(null != shoppingCartPayment.getFreightPaymentType() && 2 == shoppingCartPayment.getFreightPaymentType() && expressFee.compareTo(BigDecimal.ZERO) > 0){ + BigDecimal balance = appUser.getBalance(); + if(balance.compareTo(expressFee) < 0){ + return R.fail("账户余额不足"); + } + } + + orderService.save(order); + //构建订单明细数据 + for (MyShoppingCartVo myShoppingCartVo : goodsList) { + OrderGood orderGood = new OrderGood(); + orderGood.setGoodsId(myShoppingCartVo.getGoodsId()); + orderGood.setOrderId(order.getId()); + GetSeckillActivityInfo info = new GetSeckillActivityInfo(); + info.setGoodsId(myShoppingCartVo.getGoodsId()); + info.setVip(appUser.getVipId()); + GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData(); + if(null != goodsSeckill){ + orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill)); + } + for (int i = 0; i < objects.size(); i++) { + Long id = objects.getJSONObject(i).getLong("id"); + if(myShoppingCartVo.getId().equals(id.toString())){ + ShoppingCart shoppingCart = this.getById(id); + Integer num1 = objects.getJSONObject(i).getInteger("num"); + orderGood.setNum(num1); + Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData(); + orderGood.setGoodJson(JSON.toJSONString(goods1)); + break; + } + } + orderGood.setDelFlag(0); + orderGood.setCreateTime(LocalDateTime.now()); + orderGood.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints()); + orderGood.setSuperiorSubcommission(myShoppingCartVo.getSuperiorSubcommission()); + orderGood.setSuperiorRebatePoints(myShoppingCartVo.getSuperiorRebatePoints()); + orderGood.setSuperiorType(myShoppingCartVo.getSuperiorType()); + orderGood.setServuceShopCharges(myShoppingCartVo.getServuceShopCharges()); + orderGood.setServuceShopPoints(myShoppingCartVo.getServuceShopPoints()); + orderGood.setTechnicianPoints(myShoppingCartVo.getTechnicianPoints()); + orderGood.setBoundShopCharges(myShoppingCartVo.getBoundShopCharges()); + orderGood.setBoundShopPoints(myShoppingCartVo.getBoundShopPoints()); + orderGood.setBoundShopSuperiorsCharges(myShoppingCartVo.getBoundShopSuperiorsCharges()); + orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints()); + orderGoodService.save(orderGood); + } + + //开始构建支付数据 + //现金支付 + paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN); + if(1 == shoppingCartPayment.getPaymentType()){ + //调起微信支付 TODO 待完善 + + + + } + //账户余额 + BigDecimal redPacketAmount = BigDecimal.ZERO; + BigDecimal distributionAmount = BigDecimal.ZERO; + if(2 == shoppingCartPayment.getPaymentType()){ + BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount(); + BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount(); + BigDecimal balance = appUser.getBalance(); + //红包金额满足支付 + if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){ + totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney); + balance = balance.subtract(paymentMoney); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setBalance(balance); + redPacketAmount = paymentMoney; + }else{ + paymentMoney = paymentMoney.subtract(totalRedPacketAmount); + redPacketAmount = totalRedPacketAmount; + totalRedPacketAmount = BigDecimal.ZERO; + if(paymentMoney.compareTo(totalDistributionAmount) <= 0){ + totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney); + balance = balance.subtract(paymentMoney); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setTotalDistributionAmount(totalDistributionAmount); + appUser.setBalance(balance); + distributionAmount = paymentMoney; + }else{ + paymentMoney = paymentMoney.subtract(totalDistributionAmount); + totalDistributionAmount = BigDecimal.ZERO; + balance = balance.subtract(paymentMoney); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setTotalDistributionAmount(totalDistributionAmount); + appUser.setBalance(balance); + distributionAmount = totalDistributionAmount; + } + } + //构建积分流水记录 + if(earnPoint > 0){ + PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData(); + int earnPoint1 = earnPoint; + if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){ + earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint()); + } + appUser.setShopPoint(appUser.getShopPoint() + earnPoint); + appUser.setLavePoint(appUser.getLavePoint() + earnPoint1); + appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint); + + UserPoint userPoint = new UserPoint(); + userPoint.setType(1); + userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint1); + userPoint.setVariablePoint(earnPoint); + userPoint.setBalance(appUser.getLavePoint()); + userPoint.setCreateTime(LocalDateTime.now()); + userPoint.setAppUserId(appUser.getId()); + userPoint.setObjectId(order.getId()); + userPointClient.saveUserPoint(userPoint); + } + appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN)); + appUser.setLastShopTime(LocalDateTime.now()); + appUserClient.editAppUserById(appUser); + //构建余额明细变动记录 + BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord(); + balanceChangeRecord.setAppUserId(appUser.getId()); + balanceChangeRecord.setOrderId(order.getId()); + balanceChangeRecord.setChangeType(5); + balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney)); + balanceChangeRecord.setChangeAmount(paymentMoney); + balanceChangeRecord.setAfterAmount(balance); + balanceChangeRecord.setDelFlag(0); + balanceChangeRecord.setCreateTime(LocalDateTime.now()); + balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord); + //修改订支付状态 + order.setPayStatus(2); + if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){ + order.setOrderStatus(2); + } + orderService.updateById(order); + //删除购物车数据 + this.removeBatchByIds(ids); + //检查消费积分满足后升级会员 + vipUpgrade(appUser); + } + //积分支付 + if(3 == shoppingCartPayment.getPaymentType()){ + Integer lavePoint = appUser.getLavePoint(); + PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData(); + int earnPoint1 = earnPoint; + //计算可用积分比例 + if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){ + earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint()); + } + appUser.setLavePoint(appUser.getLavePoint() - orderPoint); + appUser.setShopPoint(appUser.getShopPoint() + earnPoint); + appUser.setLavePoint(appUser.getLavePoint() + earnPoint1); + appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint); + appUser.setLastShopTime(LocalDateTime.now()); + appUserClient.editAppUserById(appUser); + //检查消费积分满足后升级会员 + vipUpgrade(appUser); + + //构建积分流水记录 + UserPoint userPoint = new UserPoint(); + userPoint.setType(1); + userPoint.setHistoricalPoint(lavePoint); + Integer point = appUser.getLavePoint() - lavePoint; + userPoint.setVariablePoint(point >= 0 ? point : point * -1); + 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() == 1){ + //调起微信支付 + } + 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); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setBalance(balance); + redPacketAmount = expressFee; + }else{ + expressFee = expressFee.subtract(totalRedPacketAmount); + redPacketAmount = totalRedPacketAmount; + totalRedPacketAmount = BigDecimal.ZERO; + if(expressFee.compareTo(totalDistributionAmount) <= 0){ + totalDistributionAmount = totalDistributionAmount.subtract(expressFee); + balance = balance.subtract(expressFee); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setTotalDistributionAmount(totalDistributionAmount); + appUser.setBalance(balance); + distributionAmount = expressFee; + }else{ + expressFee = expressFee.subtract(totalDistributionAmount); + totalDistributionAmount = BigDecimal.ZERO; + balance = balance.subtract(expressFee); + appUser.setTotalRedPacketAmount(totalRedPacketAmount); + appUser.setTotalDistributionAmount(totalDistributionAmount); + appUser.setBalance(balance); + distributionAmount = totalDistributionAmount; + } + } + + appUserClient.editAppUserById(appUser); + //构建余额明细变动记录 + BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord(); + balanceChangeRecord.setAppUserId(appUser.getId()); + balanceChangeRecord.setOrderId(order.getId()); + balanceChangeRecord.setChangeType(5); + balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney)); + balanceChangeRecord.setChangeAmount(paymentMoney); + balanceChangeRecord.setAfterAmount(balance); + balanceChangeRecord.setDelFlag(0); + balanceChangeRecord.setCreateTime(LocalDateTime.now()); + balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord); + //修改订支付状态 + order.setPayStatus(2); + if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){ + order.setOrderStatus(2); + } + orderService.updateById(order); + //删除购物车数据 + this.removeBatchByIds(ids); + } + }else{ + //修改订支付状态 + order.setPayStatus(2); + if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){ + order.setOrderStatus(2); + } + orderService.updateById(order); + //删除购物车数据 + this.removeBatchByIds(ids); + } + } + //添加账户余额支付明细 + if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){ + OrderBalancePayment orderBalancePayment = new OrderBalancePayment(); + orderBalancePayment.setOrderId(order.getId()); + orderBalancePayment.setRedPacketAmount(redPacketAmount); + orderBalancePayment.setDistributionAmount(distributionAmount); + orderBalancePaymentService.save(orderBalancePayment); + } + return R.ok(order.getId().toString()); + } + + + public String getNumber(Integer size){ + String str = ""; + for (Integer i = 0; i < size; i++) { + str += Double.valueOf(Math.random() * 10).intValue(); + } + return str; + } + + + /** + * 会员等级变化 + * @param appUser + */ + public void vipUpgrade(AppUser appUser){ + Integer shopPoint = appUser.getShopPoint(); + Integer vipId = appUser.getVipId(); + //钻石会员 + VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData(); + Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole(); + Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop(); + if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){ + appUser.setVipId(3); + appUserClient.editAppUserById(appUser); + //添加等级变化记录 + UserChangeLog userChangeLog = new UserChangeLog(); + userChangeLog.setDelFlag(0); + userChangeLog.setCreateTime(LocalDateTime.now()); + userChangeLog.setAppUserId(appUser.getId()); + userChangeLog.setBeforeVipId(vipId); + userChangeLog.setAfterVipId(appUser.getVipId()); + userChangeLog.setChangeType(1); + userChangeLogClient.saveUserChangeLog(userChangeLog); + return; + } + //黄金会员 + VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData(); + vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole(); + vipLevelUpShop = vipSetting2.getVipLevelUpShop(); + if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){ + appUser.setVipId(2); + appUserClient.editAppUserById(appUser); + //添加等级变化记录 + UserChangeLog userChangeLog = new UserChangeLog(); + userChangeLog.setDelFlag(0); + userChangeLog.setCreateTime(LocalDateTime.now()); + userChangeLog.setAppUserId(appUser.getId()); + userChangeLog.setBeforeVipId(vipId); + userChangeLog.setAfterVipId(appUser.getVipId()); + userChangeLog.setChangeType(1); + userChangeLogClient.saveUserChangeLog(userChangeLog); + } } } -- Gitblit v1.7.1