From c144a01a7fff4e9bd169eb9d03b6ea58bc8bafb6 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 22 十月 2024 14:40:40 +0800
Subject: [PATCH] 1.钱包
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index e4c422f..75ffe19 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -12,8 +12,10 @@
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.PriceDTO;
+import com.mzl.flower.dto.request.comment.QueryFlowerCommentDTO;
import com.mzl.flower.dto.request.menber.MemberGrowthRecordDTO;
import com.mzl.flower.dto.request.payment.*;
+import com.mzl.flower.dto.response.comment.FlowerCommentVO;
import com.mzl.flower.dto.response.coupon.CouponRecordVO;
import com.mzl.flower.dto.response.flower.FlowerCartListDTO;
import com.mzl.flower.dto.response.flower.FlowerCartListWrapDTO;
@@ -42,7 +44,9 @@
import com.mzl.flower.mapper.supplier.StationMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper;
+import com.mzl.flower.pay.SybPayService;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.service.comment.FlowerCommentService;
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.menber.MemberGrowthRecordService;
@@ -96,6 +100,9 @@
@Autowired
private UserPaymentV3Service paymentV3Service;
+
+ @Autowired
+ private UserPaymentSybService paymentSybService;
@Autowired
private SequenceNo sequenceNo;
@@ -164,6 +171,9 @@
@Autowired
private CouponRecordService couponRecordService;
+ @Autowired
+ private FlowerCommentService flowerCommentService;
+
public void changeFlower2Cart(CartSaveDTO dto) {
String userId = SecurityUtils.getUserId();
@@ -196,7 +206,7 @@
Integer completeNumToday=getFlowerCompleteNumToday(userId,c.getFlowerId());
Integer tmp=completeNumToday+c.getNum();
if(null!=tmp && null!=flowerDetail.getLimited()
- && tmp.compareTo(flowerDetail.getLimited())>0){
+ && tmp.compareTo(flowerDetail.getLimited())>0){
throw new ValidationException("当天的订单的花数量加上购物车的数量不能超过限售数量！");
}
@@ -208,7 +218,7 @@
// 限购 1.首先查看购物车中的数量是否已经超过限售数量
if(null!=c.getNum() && null!=flowerDetail.getLimited()
- && c.getNum().compareTo(flowerDetail.getLimited())>0){
+ && c.getNum().compareTo(flowerDetail.getLimited())>0){
throw new ValidationException("数量不能超过限售数量！");
}
@@ -216,7 +226,7 @@
Integer completeNumToday=getFlowerCompleteNumToday(userId,c.getFlowerId());
Integer tmp=completeNumToday+c.getNum();
if(null!=tmp && null!=flowerDetail.getLimited()
- && tmp.compareTo(flowerDetail.getLimited())>0){
+ && tmp.compareTo(flowerDetail.getLimited())>0){
throw new ValidationException("当天的订单的花数量加上购物车的数量不能超过限售数量！");
}
@@ -447,7 +457,7 @@
}
}
- public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) {
+ public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) throws Exception {
String userId = SecurityUtils.getUserId();
p.getFlowers().forEach(flower -> {
// 限购数量 鲜花数量校验
@@ -459,6 +469,7 @@
}
});
+ /* 替换支付修改
WxMaJscode2SessionResult session = null;
try {
session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -469,6 +480,7 @@
if (StringUtils.isBlank(openId)) {
throw new ValidationException("微信登录失败");
}
+ */
Address address = addressMapper.selectById(dto.getAddressId());
List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
@@ -522,7 +534,7 @@
}
totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
- totalAmount = new BigDecimal(0.01);
+ totalAmount = new BigDecimal("0.01");
}
order.setTotalAmount(totalAmount);
@@ -599,7 +611,7 @@
}
order.setOrderNo(getOrderNo());
- order.setPayOpenid(openId);
+ //order.setPayOpenid(openId);替换支付修改
orderMapper.insert(order);
//处理积分商品兑换券
@@ -614,9 +626,7 @@
}
}
- Map map = paymentV3Service.wxPrepay(order);
- map.put("_testV2OrderId", order.getId());
- return map;
+ return paymentSybService.prepay(order);
}
private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
@@ -769,6 +779,7 @@
if(orders == null || orders.size() == 0){
return;
}
+ /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -785,7 +796,8 @@
orderMapper.updateById(o);
}
- //orderMapper.setPartnerOrderReceive();
+ */
+ orderMapper.setPartnerOrderReceive();
}
/**
@@ -806,6 +818,7 @@
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
+ /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -815,7 +828,7 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
-
+ */
orderMapper.updateById(o);
}
@@ -1135,6 +1148,7 @@
new QueryWrapper<OrderItem>().eq("order_id", id));
Map<Long, String> stationMap = prepareStationMap();
+ Map<String, FlowerCommentVO> commentMap=prepareCommentMap(id);
List<OrderItemListDTO> result = new ArrayList<>();
for (OrderItem oi : ls) {
@@ -1143,10 +1157,35 @@
dto.setStationName(stationMap.get(oi.getStationId()));
+ // 评论
+ final FlowerCommentVO flowerCommentVO = commentMap.get(oi.getId());
+ copyCommentInfo(dto,flowerCommentVO);
+
result.add(dto);
}
return result;
+ }
+
+ private Map<String, FlowerCommentVO> prepareCommentMap(String orderId) {
+ QueryFlowerCommentDTO queryFlowerCommentDTO = new QueryFlowerCommentDTO();
+ queryFlowerCommentDTO.setOrderId(orderId);
+ final List<FlowerCommentVO> list = flowerCommentService.getList(queryFlowerCommentDTO);
+ if (list == null || list.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ // 将 List 转换为 Map，其中 key 为 FlowerCommentVO 的 id
+ return list.stream().collect(Collectors.toMap(FlowerCommentVO::getOrderItemId, item -> item));
+ }
+
+
+ private void copyCommentInfo(OrderItemListDTO dto,FlowerCommentVO flowerCommentVO){
+ if(null != dto && null!=flowerCommentVO){
+ dto.setCommentGrade(flowerCommentVO.getCommentGrade());
+ dto.setComment(flowerCommentVO.getComment());
+ dto.setCommentImages(flowerCommentVO.getCommentImages());
+ dto.setAnonymityFalg(flowerCommentVO.getAnonymityFalg());
+ }
}
public List<Order> autoReceive() {
@@ -1203,6 +1242,7 @@
customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
}
+ /*
public JSONObject sendWxDeliveryGood(Order o) {
JSONObject json = new JSONObject();
List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1241,6 +1281,7 @@
return json;
}
}
+ */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
@@ -1395,7 +1436,7 @@
return dto;
}
- public void processAbnormalOrder(String id) {
+ public void processAbnormalOrder(String id) throws Exception {
Order o = orderMapper.selectById(id);
String transferId = o.getTransferId();
if (StringUtils.isNotEmpty(transferId)) {
@@ -1434,13 +1475,13 @@
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
- transferId = paymentV3Service.refundOrderSub(o, deductAmount);
+ transferId = paymentSybService.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
orderMapper.updateById(o);
}
- public void processLevelDown(OrderReduceDTO dto) {
+ public void processLevelDown(OrderReduceDTO dto) throws Exception {
Order o = orderMapper.selectById(dto.getId());
String transferId = o.getTransferId();
if (StringUtils.isNotEmpty(transferId)) {
@@ -1455,7 +1496,7 @@
}
BigDecimal amount = dto.getAmount();
- transferId = paymentV3Service.refundOrderSub(o, amount);
+ transferId = paymentSybService.refundOrderSub(o, amount);
o.setTransferId(transferId);
o.setTransferTime(LocalDateTime.now());
o.update(SecurityUtils.getUserId());
@@ -1678,7 +1719,7 @@
// 新增
cartMapper.updateById(cart);
}else{
- // 更新
+ // 更新
cartMapper.insert(cart);
}
}
@@ -1719,7 +1760,7 @@
public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
List<OrderListExportDTO> ls = getOrderExportListBase( dto);
- String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收获地址", "订单金额"
+ String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
, "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
@@ -1755,4 +1796,10 @@
}
+ public void exportPartnerOrderList(HttpServletResponse response, OrderQueryDTO dto) {
+ Partner p = getCurrentPartner();
+ dto.setPartnerId(p.getId());
+ exportOrderDetail(response, dto);
+ }
+
}
--
Gitblit v1.9.3