From 729027dccfb797b26816fe8d57c77fe18620594f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Oct 2022 16:53:27 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 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 924d898..4f7d45f 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
@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
+import cc.mrbird.febs.mall.vo.ApiShopApplyVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
@@ -75,6 +76,7 @@
private final MallMemberBankSignMapper mallMemberBankSignMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallShopApplyMapper mallShopApplyMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -102,6 +104,22 @@
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
+ }
+
+ int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
+ if(2 == deliverType){
+ if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
+ throw new FebsException("请选择门店");
+ }
+ Long shopId = addOrderDto.getShopId();
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
+ if(ObjectUtil.isEmpty(mallShopApply)){
+ throw new FebsException("请选择门店");
+ }
+ if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
+ throw new FebsException("请选择门店");
+ }
+ orderInfo.setShopId(shopId);
}
this.baseMapper.insert(orderInfo);
@@ -186,7 +204,13 @@
}
orderInfo.setAmount(total);
- orderInfo.setCarriage(carriage);
+ if(2 == deliverType){
+ orderInfo.setDeliverType(2);
+ orderInfo.setCarriage(BigDecimal.ZERO);
+ }else{
+ orderInfo.setDeliverType(1);
+ orderInfo.setCarriage(carriage);
+ }
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -236,10 +260,31 @@
String rcResult = "";
switch (payOrderDto.getType()) {
case "1":
+ UnipayDto unipayDtoWx = new UnipayDto();
+// unipayDto.setAmount(new BigDecimal("0.01"));
+ unipayDtoWx.setAmount(orderInfo.getAmount());
+ unipayDtoWx.setFrpCode("WEIXIN_APP3");
+ unipayDtoWx.setTradeMerchantNo("777180800385820");
+ unipayDtoWx.setOrderNo(orderInfo.getOrderNo());
+ List<MallOrderItem> itemsWx = orderInfo.getItems();
+ if(CollUtil.isEmpty(itemsWx)){
+ unipayDtoWx.setProductName("商品");
+ }else{
+ unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
+ }
+ String unipayStrWx = unipayService.unipay(unipayDtoWx);
+ if("fail" == unipayStrWx){
+ throw new FebsException("支付失败");
+ }else{
+// JSONUtil.parseObj(unipayStr);
+ JSONObject jsonObject = JSONUtil.parseObj(unipayStrWx);
+ payResultStr = (String) jsonObject.get("r7_TrxNo");
+ rcResult = (String) jsonObject.get("rc_Result");
+ }
+ orderInfo.setPayOrderNo(payResultStr);
// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
// orderInfo.setPayImage(payOrderDto.getPayImage());
orderInfo.setPayMethod("微信支付");
- agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "2":
// if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
@@ -251,7 +296,7 @@
// unipayDto.setAmount(new BigDecimal("0.01"));
unipayDto.setAmount(orderInfo.getAmount());
unipayDto.setFrpCode("ALIPAY_H5");
- unipayDto.setTradeMerchantNo("777180800385820");
+ unipayDto.setTradeMerchantNo("777184100385821");
unipayDto.setOrderNo(orderInfo.getOrderNo());
List<MallOrderItem> items = orderInfo.getItems();
if(CollUtil.isEmpty(items)){
@@ -486,6 +531,21 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
+ Integer deliverType = orderInfo.getDeliverType();
+ if(2 == deliverType){
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+ if(ObjectUtil.isNotEmpty(mallShopApply)){
+ ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
+ apiShopApplyVo.setName(mallShopApply.getName());
+ apiShopApplyVo.setPhone(mallShopApply.getPhone());
+ apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
+ apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
+ apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+ apiShopApplyVo.setShopName(mallShopApply.getShopName());
+ apiShopApplyVo.setAddress(mallShopApply.getAddress());
+ orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
+ }
+ }
return orderDetailVo;
}
--
Gitblit v1.9.1