czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重命名 PaymentPayTypeEnum

Browse Source
This commit is contained in:
gong
2025-12-18 20:22:23 +08:00
parent 0b9ebaaa96
commit dcb2a5a5f1
10 changed files with 67 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
View File

@@ -11,7 +11,7 @@ import com.czg.market.service.MkShopConsumeDiscountRecordService;
import com.czg.market.service.OrderInfoService;
import com.czg.order.entity.OrderInfo;
import com.czg.order.entity.OrderPayment;
import com.czg.order.enums.PaymentPayTypeEnum;
import com.czg.constants.PayTypeConstants;
import com.czg.order.service.OrderInfoCustomService;
import com.czg.order.service.OrderPaymentService;
import com.czg.service.market.service.impl.AppWxServiceImpl;
@@ -31,7 +31,6 @@ import java.io.IOException;
* 回调
*
* @author ww
* @description
*/
@Slf4j
@RestController
@@ -71,7 +70,7 @@ public class NotifyController {
@RequestMapping("/native/wx/transfer")
public String nativeTransferNotify(HttpServletRequest request) throws IOException {
public String nativeTransferNotify(HttpServletRequest request) {
log.info("接收到微信转账回调");
JSONObject jsonObject = wxService.verifySignature(request);
log.info("参数信息: {}", jsonObject.toJSONString());
@@ -108,13 +107,13 @@ public class NotifyController {
String tradeState = plainTextJson.getString("trade_state");
String transactionId = plainTextJson.getString("transaction_id");
OrderPayment payment = paymentService.getOne(new QueryWrapper().eq(OrderPayment::getOrderNo, outTradeNo));
payment.setPayStatus(PaymentPayTypeEnum.PayStatus.FAIL);
payment.setPayStatus(PayTypeConstants.PayStatus.FAIL);
if ("SUCCESS".equals(tradeState)) {
try {
payment.setTradeNumber(transactionId);
payment.setPayTime(DateUtil.date().toLocalDateTime());
payment.setRespJson(plainTextJson.toJSONString());
payment.setPayStatus(PaymentPayTypeEnum.PayStatus.SUCCESS);
payment.setPayStatus(PayTypeConstants.PayStatus.SUCCESS);
distributionUserService.rechargeCallBack(payment.getShopId(), payment.getAmount(), payment.getId());
} catch (Exception e) {
log.error("充值回调失败", e);

4
cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java
View File

@@ -6,7 +6,7 @@ import com.czg.market.service.PpPackageOrderService;
import com.czg.market.vo.PpPackageVO;
import com.czg.order.dto.CommonRefundDTO;
import com.czg.order.dto.LtPayOtherDTO;
import com.czg.order.enums.PaymentPayTypeEnum;
import com.czg.constants.PayTypeConstants;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.order.service.PayService;
@@ -72,7 +72,7 @@ public class UPpOrderController {
param.setPrice(price);
CzgResult<Map<String, Object>> result = CzgResult.success();
CzgResult<Map<String, Object>> mapCzgResult = payService.ltPayOther(param, PaymentPayTypeEnum.SourceType.PP, "套餐推广购买");
CzgResult<Map<String, Object>> mapCzgResult = payService.ltPayOther(param, PayTypeConstants.SourceType.PP, "套餐推广购买");
if (200 != mapCzgResult.getCode()) {
return mapCzgResult;
}

12
cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
View File

@@ -1,7 +1,6 @@
package com.czg.task;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.czg.config.RedisCst;
import com.czg.enums.OrderNoPrefixEnum;
import com.czg.market.service.OrderInfoService;
@@ -9,7 +8,7 @@ import com.czg.order.entity.CashierCart;
import com.czg.order.entity.GbOrder;
import com.czg.order.entity.OrderInfo;
import com.czg.order.entity.OrderPayment;
import com.czg.order.enums.PaymentPayTypeEnum;
import com.czg.constants.PayTypeConstants;
import com.czg.order.service.CashierCartService;
import com.czg.order.service.GbOrderService;
import com.czg.order.service.OrderPaymentService;
@@ -25,15 +24,12 @@ import org.springframework.stereotype.Component;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 订单过期处理
*
* @author ww
* @description
*/
@Slf4j
@Component
@@ -113,7 +109,7 @@ public class OTimeTask {
@Scheduled(cron = "0 50 23 * * ? ")
public void refundCompensate() {
//积分 和 拼团
List<String> ware = List.of(PaymentPayTypeEnum.SourceType.WARE, PaymentPayTypeEnum.SourceType.POINT);
List<String> ware = List.of(PayTypeConstants.SourceType.WARE, PayTypeConstants.SourceType.POINT);
LocalDateTime tenMinutesAgo = LocalDateTime.now().minusMinutes(10);
LocalDateTime thirdDayAgo = LocalDateTime.now().minusDays(3);
@@ -121,8 +117,8 @@ public class OTimeTask {
.gt(OrderPayment::getUpdateTime, thirdDayAgo)
.lt(OrderPayment::getUpdateTime, tenMinutesAgo)
.in(OrderPayment::getSourceType, ware)
.eq(OrderPayment::getPayType, PaymentPayTypeEnum.PayType.REFUND)
.ne(OrderPayment::getPayStatus, PaymentPayTypeEnum.PayStatus.SUCCESS));
.eq(OrderPayment::getPayType, PayTypeConstants.PayType.REFUND)
.ne(OrderPayment::getPayStatus, PayTypeConstants.PayStatus.SUCCESS));
for (OrderPayment payment : list) {
String refPayOrderNo = CzgRandomUtils.snowflake(OrderNoPrefixEnum.REP);
payService.unifyRefund(payment, refPayOrderNo);