From e92163c601f2ccfda20a138b60ed9ad31c47e4d6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 12 十一月 2024 18:37:22 +0800
Subject: [PATCH] add:553-结算列表增加导出表格功能;562-订单列表需要增加订单的扎数统计字段
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 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 42a838b..497b07c 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -44,7 +44,6 @@
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;
@@ -100,9 +99,6 @@
@Autowired
private UserPaymentV3Service paymentV3Service;
-
- @Autowired
- private UserPaymentSybService paymentSybService;
@Autowired
private SequenceNo sequenceNo;
@@ -469,7 +465,6 @@
}
});
- /* 替换支付修改
WxMaJscode2SessionResult session = null;
try {
session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -480,7 +475,6 @@
if (StringUtils.isBlank(openId)) {
throw new ValidationException("微信登录失败");
}
- */
Address address = addressMapper.selectById(dto.getAddressId());
List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
@@ -534,7 +528,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);
@@ -611,7 +605,7 @@
}
order.setOrderNo(getOrderNo());
- //order.setPayOpenid(openId);替换支付修改
+ order.setPayOpenid(openId);
orderMapper.insert(order);
//处理积分商品兑换券
@@ -626,7 +620,9 @@
}
}
- return paymentSybService.prepay(order);
+ Map map = paymentV3Service.wxPrepay(order);
+ map.put("_testV2OrderId", order.getId());
+ return map;
}
private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
@@ -779,7 +775,6 @@
if(orders == null || orders.size() == 0){
return;
}
- /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -796,8 +791,7 @@
orderMapper.updateById(o);
}
- */
- orderMapper.setPartnerOrderReceive();
+ //orderMapper.setPartnerOrderReceive();
}
/**
@@ -818,7 +812,6 @@
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
- /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -828,7 +821,7 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
- */
+
orderMapper.updateById(o);
}
@@ -928,6 +921,10 @@
orderIds.add(o.getId());
OrderPlatformListDTO p = new OrderPlatformListDTO();
+ //增加订单扎数
+ Integer sumNumByOrderId = orderItemMapper.getSumNumByOrderId(o.getId());
+ o.setSaleNum(sumNumByOrderId);
+
BeanUtils.copyProperties(o, p);
result.add(p);
}
@@ -1242,7 +1239,6 @@
customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
}
- /*
public JSONObject sendWxDeliveryGood(Order o) {
JSONObject json = new JSONObject();
List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1281,7 +1277,6 @@
return json;
}
}
- */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
@@ -1475,7 +1470,7 @@
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
- transferId = paymentSybService.refundOrderSub(o, deductAmount);
+ transferId = paymentV3Service.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
orderMapper.updateById(o);
@@ -1496,7 +1491,7 @@
}
BigDecimal amount = dto.getAmount();
- transferId = paymentSybService.refundOrderSub(o, amount);
+ transferId = paymentV3Service.refundOrderSub(o, amount);
o.setTransferId(transferId);
o.setTransferTime(LocalDateTime.now());
o.update(SecurityUtils.getUserId());
@@ -1761,7 +1756,7 @@
public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
List<OrderListExportDTO> ls = getOrderExportListBase( dto);
String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
- , "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
+ , "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderListExportDTO o : ls) {
@@ -1775,6 +1770,7 @@
objs[a++] = o.getCustomerAddress();
objs[a++] = o.getTotalAmount();
objs[a++] = o.getSupplierAmount();
+ objs[a++] = o.getSaleNum();
objs[a++] = o.getStatusBackendStr();
objs[a++] = o.getCreateTime();
objs[a++] = o.getPartnerName();
--
Gitblit v1.9.3