From 51338b0baa2c81175c923fc537a80ba52cfa7d8e Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 01 Sep 2022 17:13:31 +0800 Subject: [PATCH] 20220822 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 348 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 299 insertions(+), 49 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java index 62c8152..6f08fcc 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java @@ -1,7 +1,9 @@ package cc.mrbird.febs.mall.service.impl; +import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; +import cc.mrbird.febs.common.properties.XcxProperties; import cc.mrbird.febs.common.utils.*; import cc.mrbird.febs.mall.conversion.MallGoodsCommentConversion; import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion; @@ -14,19 +16,26 @@ import cc.mrbird.febs.mall.vo.OrderListVo; import cc.mrbird.febs.mall.vo.OrderRefundVo; import cc.mrbird.febs.pay.model.BrandWCPayRequestData; +import cc.mrbird.febs.pay.model.OrderStateDto; import cc.mrbird.febs.pay.service.IPayService; import cc.mrbird.febs.pay.service.IXcxPayService; +import cc.mrbird.febs.pay.util.WeixinServiceUtil; import cc.mrbird.febs.rabbit.producter.AgentProducer; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,15 +70,19 @@ private final IPayService payService; private final IXcxPayService iXcxPayService; private final IMallAchieveService mallAchieveService; + private final MallRefundMapper mallRefundMapper; + private final MallTeamLeaderMapper mallTeamLeaderMapper; + private final MallMemberMapper mallMemberMapper; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final MallLeaderAchieveMapper mallLeaderAchieveMapper; @Override @Transactional(rollbackFor = Exception.class) public Long createOrder(AddOrderDto addOrderDto) { MallMember member = LoginUserUtil.getLoginUser(); - - MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId()); - if (address == null) { - throw new FebsException("地址不存在"); + String takeUniqueCode = addOrderDto.getTakeUniqueCode(); + if(StrUtil.isEmpty(takeUniqueCode)){ + throw new FebsException("请选择自提点"); } String orderNo = MallUtils.getOrderNum(); @@ -78,11 +91,6 @@ orderInfo.setOrderTime(new Date()); orderInfo.setMemberId(member.getId()); orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue()); - orderInfo.setName(address.getName()); - orderInfo.setAddress(address.getArea() + address.getAddress()); - orderInfo.setPhone(address.getPhone()); - orderInfo.setLatitude(address.getLatitude()); - orderInfo.setLongitude(address.getLongitude()); orderInfo.setRemark(addOrderDto.getRemark()); orderInfo.setOrderType(addOrderDto.getOrderType()); @@ -120,6 +128,7 @@ orderItem.setStyleName(mallGoods.getGoodsName()); orderItem.setSkuName(mallGoods.getGoodsName()); orderItem.setSkuImage(mallGoods.getThumb()); + orderItem.setState(1); total = total.add(amount); } else { @@ -154,6 +163,7 @@ orderItem.setGoodsId(sku.getGoodsId()); orderItem.setGoodsName(sku.getGoodsName()); orderItem.setSkuId(sku.getId()); + orderItem.setState(1); orderItem.setStyleName(sku.getStyleName()); orderItem.setSkuName(sku.getSkuName()); orderItem.setSkuImage(sku.getSkuImage()); @@ -173,9 +183,27 @@ } mallOrderItemMapper.insert(orderItem); } - + //配送费 + BigDecimal delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount(); + if(BigDecimal.ZERO.compareTo(delivaryAmount) < 0 && 1 == addOrderDto.getIsHome()){ + total = total.add(delivaryAmount); + } orderInfo.setAmount(total); orderInfo.setCarriage(carriage); + + MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId()); + orderInfo.setName(address.getName()); + orderInfo.setPhone(address.getPhone()); + orderInfo.setIsHome(addOrderDto.getIsHome()); + //订单金额大于50,且选择送货上门,订单需要选择地址信息 + if(1 == addOrderDto.getIsHome()){ + if (StrUtil.isBlank(address.getLatitude())||StrUtil.isBlank(address.getLongitude())) { + throw new FebsException("请添加地址"); + } + orderInfo.setAddress(address.getArea() + address.getAddress()); + orderInfo.setLatitude(address.getLatitude()); + orderInfo.setLongitude(address.getLongitude()); + } this.baseMapper.updateById(orderInfo); agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L); @@ -201,6 +229,44 @@ this.baseMapper.updateById(orderInfo); } + /** + * 根据用户ID和订单ID获取所购买商品名称 + * @return 所含商品名称(多个以","隔开) + */ + public String getProductNames(Long memberId, Long orderId) { + MallOrderInfo mallOrderInfo = this.baseMapper.selectOrderByMemberIdAndId(memberId, orderId); + List<MallOrderItem> details = mallOrderInfo.getItems(); + if (CollectionUtils.isEmpty(details)) { + return ""; + } + StringBuffer productNameBuffer = new StringBuffer(); + Integer maxLength = 30; + for (int i = 0; i< details.size(); i++) { + MallOrderItem mallOrderItem = details.get(i); + String goodsName = mallOrderItem.getGoodsName(); + if (goodsName == null) { + continue; + } + if (i == 0 && goodsName.length() > maxLength) { + productNameBuffer.append(goodsName.substring(0, maxLength) + "..."); + break; + } + if ((productNameBuffer.length() + goodsName.length()) > maxLength) { + productNameBuffer.append("等"); + break; + } + productNameBuffer.append(goodsName + ","); + } + String productNames = productNameBuffer.toString(); + if (productNames.endsWith(",")) { + productNames = productNames.substring(0, productNames.length() - 1); + } + if (productNames.endsWith(",等")) { + productNames = productNames.substring(0, productNames.length() - 2) + "等"; + } + return productNames; + } + @Override @Transactional(rollbackFor = Exception.class) public Map<String, Object> payOrder(PayOrderDto payOrderDto) { @@ -215,6 +281,7 @@ } String payResultStr = ""; + String wxResultStr = ""; switch (payOrderDto.getType()) { case "1": // orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo()); @@ -225,9 +292,10 @@ } catch (Exception e) { throw new FebsException("支付失败"); } + wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData); payResultStr = brandWCPayRequestData.getPrepay_id(); orderInfo.setPayMethod("微信支付"); - agentProducer.sendOrderReturn(orderInfo.getId()); +// agentProducer.sendOrderReturn(orderInfo.getId()); break; case "2": if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) { @@ -248,44 +316,45 @@ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue()); orderInfo.setPayTime(new Date()); orderInfo.setPayResult("1"); + orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue()); - boolean hasTc = false; - // 静态倍数 - List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId()); - if (CollUtil.isNotEmpty(orderItems)) { - for (MallOrderItem orderItem : orderItems) { - MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId()); - BigDecimal score = BigDecimal.ZERO; - MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId()); - if (mallGoods.getIsNormal() == 2) { - hasTc = true; - score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt())); -// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti(); -// score = sku.getPresentPrice().multiply(staticMulti); - } - - if (score.compareTo(BigDecimal.ZERO) > 0) { - memberWalletService.add(score, member.getId(), "score"); - mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue()); - - // 添加业绩 - mallAchieveService.add(orderItem.getId()); - } - } - } +// boolean hasTc = false; +// // 静态倍数 +// List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId()); +// if (CollUtil.isNotEmpty(orderItems)) { +// for (MallOrderItem orderItem : orderItems) { +// MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId()); +// BigDecimal score = BigDecimal.ZERO; +// MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId()); +// if (mallGoods.getIsNormal() == 2) { +// hasTc = true; +// score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt())); +//// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti(); +//// score = sku.getPresentPrice().multiply(staticMulti); +// } +// +// if (score.compareTo(BigDecimal.ZERO) > 0) { +// memberWalletService.add(score, member.getId(), "score"); +// mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue()); +// +// // 添加业绩 +// mallAchieveService.add(orderItem.getId()); +// } +// } +// } // 购买套餐后,升级为普通会员 - if (hasTc) { - MallMember mallMember = memberMapper.selectById(member.getId()); - if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) { - mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name()); - memberMapper.updateById(mallMember); - } - } +// if (hasTc) { +// MallMember mallMember = memberMapper.selectById(member.getId()); +// if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) { +// mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name()); +// memberMapper.updateById(mallMember); +// } +// } mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue()); - agentProducer.sendAutoLevelUpMsg(member.getId()); - agentProducer.sendOrderReturn(orderInfo.getId()); +// agentProducer.sendAutoLevelUpMsg(member.getId()); +// agentProducer.sendOrderReturn(orderInfo.getId()); break; case "4": if (orderInfo.getOrderType() != 2) { @@ -309,10 +378,28 @@ orderInfo.setTakeCode(takeCode); this.baseMapper.updateById(orderInfo); + + + +// OrderStateDto orderStateDto = new OrderStateDto(); +// orderStateDto.setOrderNo(orderInfo.getOrderNo()); +// String productNames = getProductNames(orderInfo.getMemberId(), orderInfo.getId()); +// orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames); +// orderStateDto.setOrderState("已送达自提点"); +// orderStateDto.setTakeCode(orderInfo.getTakeCode()); +// String takeUniqueCode = orderInfo.getTakeUniqueCode(); +// MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode); +// orderStateDto.setAddressArea(mallTeamLeader.getAddressArea()); +// orderStateDto.setOpenId(mallMemberMapper.selectById(orderInfo.getMemberId()).getOpenId()); +// DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode()); +// orderStateDto.setTemplateId(dataDictionaryCustom.getValue()); +//// iXcxPayService.pushOrderToAddress(orderStateDto); +// iXcxPayService.uniformMessageSend(orderStateDto); Map<String, Object> map = new HashMap<>(); map.put("orderInfo", payResultStr); map.put("orderNo", orderInfo.getOrderNo()); map.put("orderId", orderInfo.getId()); + map.put("wxResultStr", wxResultStr); return map; } @@ -358,11 +445,11 @@ OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo); - if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) { - MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId()); - orderDetailVo.setExpressNo(expressInfo.getExpressNo()); - orderDetailVo.setExpressCom(expressInfo.getExpressCom()); - } +// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) { +// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId()); +// orderDetailVo.setExpressNo(expressInfo.getExpressNo()); +// orderDetailVo.setExpressCom(expressInfo.getExpressCom()); +// } if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) { MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId()); @@ -392,9 +479,22 @@ throw new FebsException("该状态不能确认收货"); } + if (orderInfo.getDeliveryState() != OrderDeliveryStateEnum.DELIVERY_FINISH.getValue()) { + throw new FebsException("还未送至自提点"); + } + orderInfo.setStatus(OrderStatusEnum.FINISH.getValue()); orderInfo.setReceivingTime(new Date()); this.baseMapper.updateById(orderInfo); + + //生成一条团长提成记录 + MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve(); + mallLeaderAchieve.setMemberId(orderInfo.getMemberId()); + mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo()); + mallLeaderAchieve.setAmount(orderInfo.getAmount()); + mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode()); + mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE); + mallLeaderAchieveMapper.insert(mallLeaderAchieve); } @Override @@ -548,4 +648,154 @@ } } + @Autowired + private WeixinServiceUtil weixinServiceUtil; + private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class); + + @Override + @Transactional + public FebsResponse refundOrder(Long id) { + MallMember member = LoginUserUtil.getLoginUser(); + MallOrderInfo mallOrderInfo = this.baseMapper.selectById(id); + if(ObjectUtil.isEmpty(mallOrderInfo)){ + return new FebsResponse().fail().message("订单不存在"); + } + Integer status = mallOrderInfo.getStatus(); + if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){ + return new FebsResponse().fail().message("订单不是待发货状态"); + } + Integer deliveryState = mallOrderInfo.getDeliveryState(); + if(1 != deliveryState){ + return new FebsResponse().fail().message("订单不是待配送状态"); + } + QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("member_id",member.getId()); + objectQueryWrapper.eq("order_id",mallOrderInfo.getId()); + MallRefundEntity mallRefund = mallRefundMapper.selectOne(objectQueryWrapper); + MallRefundEntity mallRefundEntity = new MallRefundEntity(); + if(ObjectUtil.isEmpty(mallRefund)){ + mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_r"); + mallRefundEntity.setMemberId(member.getId()); + mallRefundEntity.setOrderId(mallOrderInfo.getId()); + mallRefundEntity.setType(1); + mallRefundEntity.setState(3); + mallRefundEntity.setAmount(mallOrderInfo.getAmount()); + mallRefundMapper.insert(mallRefundEntity); + }else{ + if(mallRefund.getState() == 1){ + return new FebsResponse().fail().message("订单已退款"); + } + if(mallRefund.getState() == 3){ + return new FebsResponse().fail().message("订单退款中"); + } + if(mallRefund.getState() == 2){ + mallRefundEntity.setId(mallRefund.getId()); + mallRefundEntity.setRefundNo(mallRefund.getRefundNo()); + mallRefundEntity.setMemberId(mallRefund.getMemberId()); + mallRefundEntity.setOrderId(mallRefund.getOrderId()); + mallRefundEntity.setType(mallRefund.getType()); + mallRefundEntity.setState(3); + mallRefundEntity.setAmount(mallRefund.getAmount()); + mallRefundMapper.updateById(mallRefundEntity); + } + } + + //退款订单编号 + String orderNo = mallOrderInfo.getOrderNo(); + //退款退款编号 + String refundNo = mallRefundEntity.getRefundNo(); + //退款订单金额 + BigDecimal orderAmount = mallOrderInfo.getAmount(); + BigDecimal aa = new BigDecimal(100); + int orderMoney = orderAmount.multiply(aa).intValue(); + + //退款退款金额 + BigDecimal refundAmount = mallRefundEntity.getAmount(); + BigDecimal bb = new BigDecimal(100); + int refundMoney = refundAmount.multiply(bb).intValue(); + + Long refundId = mallRefundEntity.getId(); + MallRefundEntity mallRefundOld = mallRefundMapper.selectById(refundId); + MallOrderInfo mallOrderInfoOld = this.baseMapper.selectByOrderNo(orderNo); + //余额支付退款 + if(OrderPayMethodEnum.BALANCE.getName().equals(mallOrderInfo.getPayMethod())){ + mallRefundOld.setState(1); + mallRefundMapper.updateById(mallRefundOld); + mallOrderInfoOld.setStatus(OrderStatusEnum.REFUNDED.getValue()); + this.baseMapper.updateById(mallOrderInfoOld); + mallMoneyFlowService.addMoneyFlow(mallOrderInfoOld.getMemberId(), mallOrderInfoOld.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue()); + memberWalletService.add(refundAmount, member.getId(), "balance"); + mallOrderItemMapper.updateStateByOrderId(3,mallOrderInfoOld.getId()); + return new FebsResponse().success().message("退款成功"); + } + + Boolean flag = false; + Boolean debug = xcxProperties.getDebug(); + if (debug) { + boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null); + flag = b; + } else { + log.info("开始调用退款接口。。。退款编号为{}", refundNo); + boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null); + flag = b; + } + + /** + * 更新退款表 + * 更新订单表 + */ + if(flag){ + mallRefundOld.setState(1); + mallRefundMapper.updateById(mallRefundOld); + mallOrderInfoOld.setStatus(OrderStatusEnum.REFUNDED.getValue()); + this.baseMapper.updateById(mallOrderInfoOld); + mallOrderItemMapper.updateStateByOrderId(3,mallOrderInfoOld.getId()); + mallMoneyFlowService.addMoneyFlow(mallOrderInfoOld.getMemberId(), mallOrderInfoOld.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue()); + }else{ + mallRefundOld.setState(2); + mallRefundMapper.updateById(mallRefundOld); + return new FebsResponse().fail().message("退款失败,请联系客服人员"); + } + return new FebsResponse().success().message("退款成功"); + } + + @Override + public FebsResponse applyRefundOrder(ApplyRefundOrderDto applyRefundOrderDto) { + Long orderId = applyRefundOrderDto.getOrderId(); + Long itemId = applyRefundOrderDto.getItemId(); + MallMember member = LoginUserUtil.getLoginUser(); + MallOrderInfo mallOrderInfo = this.baseMapper.selectById(orderId); + if(ObjectUtil.isEmpty(mallOrderInfo)){ + return new FebsResponse().fail().message("订单不存在"); + } + + List<MallRefundEntity> mallRefundEntitieSuccess = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId,orderId,1); + List<MallRefundEntity> mallRefundEntitiesIng = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId,orderId,3); + if(CollUtil.isNotEmpty(mallRefundEntitieSuccess) || CollUtil.isNotEmpty(mallRefundEntitiesIng)){ + return new FebsResponse().fail().message("该订单无法申请退款"); + } + + MallRefundEntity mallRefundEntity = new MallRefundEntity(); + MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId); + if(ObjectUtil.isNotEmpty(mallOrderItem)){ + mallOrderItem.setState(2); + mallOrderItemMapper.updateById(mallOrderItem); + mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+itemId); + mallRefundEntity.setItemId(itemId); + }else{ + + mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_R"+orderId); + } + mallRefundEntity.setRefundReason(applyRefundOrderDto.getRefundReason()); + mallRefundEntity.setRefundRemark(applyRefundOrderDto.getRefundRemark()); + mallRefundEntity.setRefundPic(applyRefundOrderDto.getRefundPic()); + mallRefundEntity.setMemberId(member.getId()); + mallRefundEntity.setState(3); + mallRefundEntity.setType(applyRefundOrderDto.getType()); + mallRefundEntity.setOrderId(orderId); + mallRefundEntity.setAmount(mallOrderItem.getAmount()); + mallRefundMapper.insert(mallRefundEntity); + return new FebsResponse().success().message("已申请"); + } + } -- Gitblit v1.9.1