ソースを参照

添加事务和现金支付标识

yq 3 年 前
コミット
e2001eca38

+ 2 - 2
src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -66,7 +66,7 @@ public class OrderController extends BaseController {
      * @param orderRequest
      * @return
      */
-    @GetMapping("/list")
+    @PostMapping("/list")
     public AjaxResult list(@RequestBody OrderRequest orderRequest){
         return AjaxResult.success(orderService.list(orderRequest));
     }
@@ -76,7 +76,7 @@ public class OrderController extends BaseController {
      * @param order
      * @return
      */
-    @GetMapping("/topScanPayApi")
+    @PostMapping("/topScanPayApi")
     public AjaxResult getTopScanPayApi(@RequestBody Order order){
         return AjaxResult.success(orderService.getTopScanPayApi(order));
     }

+ 4 - 0
src/main/java/com/usky/dxtop/service/impl/CallApiLogServiceImpl.java

@@ -10,6 +10,7 @@ import com.usky.dxtop.model.CallApiLog;
 import com.usky.dxtop.service.CallApiLogService;
 import com.usky.dxtop.service.api.TopApi;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -24,6 +25,8 @@ import java.util.List;
 @Service
 public class CallApiLogServiceImpl extends ServiceImpl<CallApiLogMapper, CallApiLog> implements CallApiLogService {
 
+
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public CallApiLog add(String orderNumber, String apiName, String url, String param,String result) {
         CallApiLog callApiLog = new CallApiLog();
@@ -36,6 +39,7 @@ public class CallApiLogServiceImpl extends ServiceImpl<CallApiLogMapper, CallApi
         return callApiLog;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean update(CallApiLog callApiLog) {
         return this.updateById(callApiLog);

+ 2 - 0
src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.CallApiLogService;
 import com.usky.dxtop.service.OrderService;
 import com.usky.dxtop.service.api.TopApi;
+import com.usky.dxtop.service.emun.OrderPayType;
 import com.usky.dxtop.service.emun.OrderStatus;
 import com.usky.dxtop.service.vo.OrderRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -61,6 +62,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         String orderNumber = TopApi.getOrderNumber();
         order.setOrderNumber(orderNumber);
         order.setOrderFlag(OrderStatus.NO_PAYMENT.getCode());
+        order.setPayType(OrderPayType.XJ.getPayCode());
         this.save(order);
         callCardTopApi(order);
         return true;