| 2024-11-04 | cloudroam |  |
| 2024-10-29 | Cui Zhi Feng | |
src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -52,9 +52,6 @@ private UserPaymentV3Service paymentV3Service; @Autowired private UserPaymentSybService paymentSybService; @Autowired private OrderService orderService; @Autowired @@ -130,11 +127,10 @@ try { LocalDateTime createdTime = o.getCreateTime().plusMinutes(5); if (createdTime.isBefore(LocalDateTime.now())) { /*boolean f = paymentV3Service.checkOrderStatus(o.getId()); boolean f = paymentV3Service.checkOrderStatus(o.getId()); if(!f){ paymentV3Service.cancelOrder(o.getId()); }*/ paymentSybService.cancelOrder(o.getId()); } } } catch (Exception e) { log.error(e.getMessage(), e); src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -50,7 +50,7 @@ private OrderItemMapper orderItemMapper; @Autowired private UserPaymentSybService paymentSybService; private UserPaymentV3Service paymentV3Service; @Autowired private SequenceNo sequenceNo; @@ -449,7 +449,7 @@ if(Constants.ORDER_SALES_STATUS.AGREED.name().equals(sl.getStatus())){ if(totalFeeWithPacking.doubleValue() > 0) { String refundId = paymentSybService.refundOrderSub(o, totalFeeWithPacking); String refundId = paymentV3Service.refundOrderSub(o, totalFeeWithPacking); sl.setRefundId(refundId); } } 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 @@ -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); } @@ -1242,7 +1235,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 +1273,6 @@ return json; } } */ public Order confirmOrderReceive(String id) { Order o = orderMapper.selectById(id); @@ -1475,7 +1466,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 +1487,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()); src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
@@ -9,6 +9,7 @@ import com.mzl.flower.dto.request.flower.FlowerQueryDTO; import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO; import com.mzl.flower.dto.request.payment.OrderQueryDTO; import com.mzl.flower.dto.response.payment.OrderStatusCountDTO; import com.mzl.flower.dto.response.statistics.FlowerStatisticsDTO; import com.mzl.flower.dto.response.statistics.OrderStatisticsDTO; import com.mzl.flower.dto.response.statistics.RateStatisticsDTO; @@ -112,12 +113,20 @@ .eq("deleted", 0)); dto.setCustomerCount(cc.longValue());//用户管理：统计商户列表已启用的全部用户（点击跳转到商户列表） Integer oc = orderMapper.selectCount(new QueryWrapper<Order>() .eq("deleted", 0) .isNotNull("payment_time") .isNull("cancel_time") .isNull("refund_time")); dto.setOrderCount(oc.longValue());//订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表） //订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表） List<OrderStatusCountDTO> ll = orderMapper.getOrderStatusCount(new OrderQueryDTO()); Integer oc = 0; if (ll != null && ll.size() > 0) { for (OrderStatusCountDTO c : ll) { if(Constants.ORDER_STATUS_BACKEND.PENDING.name().equals(c.getValue()) || Constants.ORDER_STATUS_BACKEND.CANCEL.name().equals(c.getValue()) || Constants.ORDER_STATUS_BACKEND.REFUND.name().equals(c.getValue())){ continue; } oc += c.getOrderCount(); } } dto.setOrderCount(oc.longValue()); page = new Page(1, 1); OrderQueryDTO oq = new OrderQueryDTO(); src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java
@@ -13,7 +13,6 @@ import com.mzl.flower.dto.response.payment.OrderListDTO; import com.mzl.flower.entity.payment.Order; import com.mzl.flower.service.payment.OrderService; import com.mzl.flower.service.payment.UserPaymentSybService; import com.mzl.flower.service.payment.UserPaymentV3Service; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -38,7 +37,7 @@ private OrderService orderService; @Autowired private UserPaymentSybService paymentSybService; private UserPaymentV3Service paymentV3Service; @GetMapping("/list") @ApiOperation(value = "查询订单列表") @@ -80,12 +79,12 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query") }) public ResponseEntity<ReturnDataDTO<?>> payAgain(String id) throws Exception { boolean f = paymentSybService.checkOrderStatusPayAgain(id); public ResponseEntity<ReturnDataDTO<?>> payAgain(String id){ boolean f = paymentV3Service.checkOrderStatus(id, true); if(f){ throw new ValidationException("订单不可再支付"); } return returnData(R.SUCCESS.getCode(), paymentSybService.payAgain(id)); return returnData(R.SUCCESS.getCode(), paymentV3Service.payAgain(id)); } @GetMapping(value = "/refund") @@ -95,13 +94,18 @@ @ApiOperation(value = "退款") public ResponseEntity<ReturnDataDTO> refundOrder(String id) throws Exception { orderService.refundCheck(id); boolean f = paymentSybService.checkOrderStatusRefund(id); if(f) { throw new ValidationException("订单不可退款"); } paymentSybService.refundOrderCustomer(id); paymentV3Service.refundOrder(id); return returnData(R.SUCCESS.getCode(), null); } /*@GetMapping(value = "/refund/check") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"), }) @ApiOperation(value = "查询退款") public ResponseEntity<ReturnDataDTO> refundQuery(String id) { return returnData(R.SUCCESS.getCode(), paymentV3Service.refundQuery(id)); }*/ @PostMapping("/evaluate") @ApiOperation(value = "评价") @@ -127,8 +131,11 @@ @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"), }) @ApiOperation(value = "取消订单") public ResponseEntity<ReturnDataDTO> cancelOrder(String id) throws Exception { paymentSybService.cancelOrder(id); public ResponseEntity<ReturnDataDTO> cancelOrder(String id) { boolean f = paymentV3Service.checkOrderStatus(id); if(!f){ paymentV3Service.cancelOrder(id); } return returnData(R.SUCCESS.getCode(), null); }
@@ -11,7 +11,7 @@ import com.mzl.flower.dto.response.payment.*; import com.mzl.flower.service.payment.DeliveryOrderService; import com.mzl.flower.service.payment.OrderService; import com.mzl.flower.service.payment.UserPaymentSybService; import com.mzl.flower.service.payment.UserPaymentV3Service; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,7 +36,7 @@ private OrderService orderService; @Autowired private UserPaymentSybService paymentSybService; private UserPaymentV3Service paymentV3Service; @Autowired private DeliveryOrderService deliveryOrderService; @@ -175,9 +175,9 @@ @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"), }) @ApiOperation(value = "退款") public ResponseEntity<ReturnDataDTO> refundOrder(String id) throws Exception { public ResponseEntity<ReturnDataDTO> refundOrder(String id) { orderService.refundCheckAdmin(id); paymentSybService.refundOrder(id); paymentV3Service.refundOrder(id); return returnData(R.SUCCESS.getCode(), null); }
