From e065e77947ab1f82bdf172dddc194e05561ff151 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 14 十一月 2023 18:47:38 +0800
Subject: [PATCH] 订单-积分退款
---
phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java b/phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java
index d9477ca..2850ddf 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java
@@ -19,8 +19,6 @@
import com.hx.phiappt.constants.tool.PerformanceInfoTool;
import com.hx.phiappt.constants.tool.UserStatusTool;
import com.hx.phiappt.constants.tool.clubEquity.ClubEquityTool;
-import com.hx.phiappt.constants.tool.order.OrderNewUtil;
-import com.hx.phiappt.constants.tool.clubEquity.ClubEquityTool;
import com.hx.phiappt.dao.mapper.CouponNumberMapper;
import com.hx.phiappt.model.*;
import com.hx.phiappt.model.coupon.Coupon;
@@ -46,7 +44,10 @@
import com.hx.util.thread.ExecutorServiceTool;
import com.hz.crm.dto.oldBrinNew.OldBrinNewDto;
import com.hz.crm.feign.FOldBrinNewService;
-import com.hz.his.dto.order.*;
+import com.hz.his.dto.order.OrderInitVo;
+import com.hz.his.dto.order.OrderPHisDto;
+import com.hz.his.dto.order.PayAmountDto;
+import com.hz.his.dto.order.PayDto;
import com.hz.his.feign.service.dcp.SUserTagInfoService;
import com.platform.constants.LoginConstant;
import com.platform.entity.ThirtApplication;
@@ -55,7 +56,6 @@
import com.platform.resultTool.PlatformResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -65,8 +65,6 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
/**
* 璁㈠崟鎺у埗鍣�
@@ -215,7 +213,7 @@
* 缁撹处
*/
@RequestMapping(value = "/payMoney",method = RequestMethod.POST)
- public synchronized PlatformResult orderPayMoney(HttpServletRequest request,@RequestBody PayDto payDto) {
+ public PlatformResult orderPayMoney(HttpServletRequest request,@RequestBody PayDto payDto) {
//鏍￠獙绛惧悕
ThirtApplication thirtApplication= (ThirtApplication) request.getSession().getAttribute(LoginConstant.LOGIN_APPLY);
if(thirtApplication==null){
--
Gitblit v1.8.0