From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 25 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 c79d7e6..a1792d2 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;
@@ -499,6 +495,19 @@
usePointGoods(order.getId(), goodsRecordIdList);//使用积分商品兑换券
order.create(userId);
+ // 根据当前的时间判断，如果时间大于当天的下午17:00 ，那么日期则为下一天的日期，否则为当天日期
+ if(null!=order.getCreateTime()){
+ LocalDateTime createDateTime = order.getCreateTime();
+ LocalDate createDate = createDateTime.toLocalDate();
+ LocalDateTime today1700 = createDateTime.with(LocalTime.of(17, 0));
+ // 比较时间是否大于当天的 17:00
+ if (createDateTime.isAfter(today1700)) {
+ // 如果大于 17:00，设置为下一天的日期
+ createDate = createDate.plusDays(1);
+ }
+ order.setCreateDateSta(createDate);
+ }
+// order.setCreateDate();
order.setRemarks(dto.getRemarks());
order.setSpecialNeeds(dto.getSpecialNeeds());
order.setStatusBackend(Constants.ORDER_STATUS_BACKEND.PENDING.name());
@@ -532,7 +541,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);
@@ -624,9 +633,8 @@
}
}
- Map map = paymentSybService.prepay(order);
+ Map map = paymentV3Service.wxPrepay(order);
map.put("_testV2OrderId", order.getId());
-
return map;
}
@@ -780,7 +788,6 @@
if(orders == null || orders.size() == 0){
return;
}
- /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -797,8 +804,7 @@
orderMapper.updateById(o);
}
- */
- orderMapper.setPartnerOrderReceive();
+ //orderMapper.setPartnerOrderReceive();
}
/**
@@ -810,16 +816,22 @@
if (StringUtils.isEmpty(dto.getDeliveryNo())) {
throw new ValidationException("快递号不能为空");
}
+ if (StringUtils.isEmpty(dto.getLogisticsCompanyCode())) {
+ throw new ValidationException("物流公司编码不能为空");
+ }
Order o = orderMapper.selectById(dto.getId());
+ //上传快递号逻辑调整：由原来输入快递单号直接发送，调整先输入快递单号再点击发送，先保存订单得快递号
+ if (StringUtils.isEmpty(o.getDeliveryNo())) {
+ throw new ValidationException("快递号不能为空");
+ }
if (!Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())) {
throw new ValidationException("请先完成质检");
}
- o.setDeliveryNo(dto.getDeliveryNo());
+// o.setDeliveryNo(dto.getDeliveryNo());
o.setStatus(Constants.ORDER_STATUS.RECEIVE.name());
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
- /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -829,7 +841,19 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
- */
+
+ orderMapper.updateById(o);
+ }
+
+ public void saveDeliveryNoInfo(OrderDeliveryNoDTO dto) {
+ //上传快递号逻辑调整：由原来输入快递单号直接发送，调整先输入快递单号再点击发送，先保存订单得快递号
+ Order o = orderMapper.selectById(dto.getId());
+ if (!Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())) {
+ throw new ValidationException("请先完成质检");
+ }
+ o.setDeliveryNo(dto.getDeliveryNo());
+ o.setLogisticsCompanyCode(dto.getLogisticsCompanyCode());
+ o.update(SecurityUtils.getUserId());
orderMapper.updateById(o);
}
@@ -929,6 +953,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);
}
@@ -1243,7 +1271,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>()
@@ -1265,14 +1292,10 @@
for (OrderItem item : items) {
sb.append(item.getFlowerName() + "*" + item.getNum() + "扎、");//商品信息
}
+ String phoneNumber = o.getCustomerTel();
+ String maskedNumber = maskPhoneNumber(phoneNumber);
try {
- json = wxDeliveryGoodService.wxDeliveryGood(
- o.getId(),
- o.getPayOpenid(),
- o.getPaymentTrId(),
- sb.toString(),
- PyamentV3Configurer.merchantId,
- accessToken);
+ json = wxDeliveryGoodService.wxDeliveryGood(o.getId(), o.getPayOpenid(), o.getPaymentTrId(), sb.toString(), PyamentV3Configurer.merchantId, accessToken, o.getPartnerId(), o.getDeliveryNo(),o.getLogisticsCompanyCode(),maskedNumber);
} catch (Exception e) {
log.error("订单" + o.getOrderNo() + "发货，调用微信发货接口失败", e);
json.put("errcode", -1);
@@ -1282,7 +1305,6 @@
return json;
}
}
- */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
@@ -1476,7 +1498,7 @@
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
- transferId = paymentSybService.refundOrderSub(o, deductAmount);
+ transferId = paymentV3Service.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
orderMapper.updateById(o);
@@ -1497,7 +1519,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());
@@ -1762,7 +1784,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) {
@@ -1776,12 +1798,14 @@
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();
objs[a++] = o.getWarehouseLocationCode();
objs[a++] = o.getSpecialNeedsStr();
objs[a++] = o.getRemarks();
+ objs[a++] = o.getLogisticsCompanyCode();
dataList.add(objs);
sn++;
@@ -1803,4 +1827,45 @@
exportOrderDetail(response, dto);
}
+ public void refreshDate() {
+ List<Order> allOrderList= orderMapper.selectAllDateList();
+
+ allOrderList.forEach(order -> {
+ orderMapper.updatePaymentCreateDate(order);
+ });
+ }
+
+ public List<OrderStatusCountDTO> getAbnormalOrderStatusCount(OrderQueryDTO dto) {
+ dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true));
+ dto.setEndDate(parseLocalDateTime(dto.getEndDateStr(), false));
+
+ dto.setCreateStartDate(parseLocalDateTime(dto.getCreateStartDateStr(), 17, 0, 0, -1));
+ dto.setCreateEndDate(parseLocalDateTime(dto.getCreateEndDateStr(), 17, 0, 0, 0));
+
+ List<CodeValueDTO> ls = codeService.searchValue("ABNORMAL_ORDER_STATUS");
+ List<OrderStatusCountDTO> ll = orderMapper.getAbnormalOrderStatusCount(dto);
+ Map<String, Integer> llMap = new HashMap<>();
+ if (ll != null && ll.size() > 0) {
+ for (OrderStatusCountDTO c : ll) {
+ llMap.put(c.getValue(), c.getOrderCount());
+ }
+ }
+
+ List<OrderStatusCountDTO> rr = new ArrayList<>();
+ for (CodeValueDTO c : ls) {
+ OrderStatusCountDTO r = new OrderStatusCountDTO();
+ r.setValue(c.getValue());
+ r.setLabel(c.getLabel());
+ Integer count = llMap.get(r.getValue());
+ r.setOrderCount(count == null ? 0 : count);
+
+ rr.add(r);
+ }
+
+ return rr;
+ }
+
+ public static String maskPhoneNumber(String phoneNumber) {
+ return phoneNumber.substring(0, phoneNumber.length() - 8) + "****" + phoneNumber.substring(phoneNumber.length() - 4);
+ }
}
--
Gitblit v1.9.3