Prechádzať zdrojové kódy

feat: "空中云汇订单增加设备类型和公司平台。"

Ritchie 2 rokov pred
rodič
commit
19acead1f2

+ 24 - 2
src/main/java/com/szwl/controller/AirwallexPayController.java

@@ -9,13 +9,17 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.szwl.common.AccessTokenCommon;
 import com.szwl.constant.AirwallexConstant;
+import com.szwl.feign.bean.SzwlFeign;
 import com.szwl.model.bean.PaymentIntentRequestBody;
 import com.szwl.model.bean.RefundRequestBody;
+import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.dto.*;
+import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TAirwallexPayment;
 import com.szwl.model.entity.TCoinOrder;
+import com.szwl.model.entity.TEquipment;
 import com.szwl.model.utils.AccessTokenThreadUtil;
 import com.szwl.service.*;
 import io.swagger.annotations.Api;
@@ -48,11 +52,14 @@ public class AirwallexPayController {
 
     TAirwallexPaymentService tAirwallexPaymentService;
 
-    public AirwallexPayController(TAdminService tAdminService, AirwallexService airwallexService, TCoinOrderService tCoinOrderService, TAirwallexPaymentService tAirwallexPaymentService) {
+    SzwlFeign szwlFeign;
+
+    public AirwallexPayController(TAdminService tAdminService, AirwallexService airwallexService, TCoinOrderService tCoinOrderService, TAirwallexPaymentService tAirwallexPaymentService, SzwlFeign szwlFeign) {
         this.tAdminService = tAdminService;
         this.airwallexService = airwallexService;
         this.tCoinOrderService = tCoinOrderService;
         this.tAirwallexPaymentService = tAirwallexPaymentService;
+        this.szwlFeign = szwlFeign;
     }
 
     @ApiOperation(value = "创建收款人")
@@ -107,6 +114,7 @@ public class AirwallexPayController {
 
     /**
      * 创建付款意向 - 消费者发起
+     *
      * @param paymentIntentRequestBody
      * @return
      */
@@ -136,6 +144,19 @@ public class AirwallexPayController {
         String productName = paymentIntentRequestBody.getProductName();
         String clientId = paymentIntentRequestBody.getClientId();
         Long equipmentId = paymentIntentRequestBody.getEquipmentId();
+
+        // 七云还是申泽
+        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
+//        System.out.println("设备信息:>>> " + equipment);
+        String machineType = equipment.getMachineType(); // 设备类型
+        Long adminId = equipment.getAdminId();
+        if (adminId == null) {
+            return R.fail("找不到设备商家");
+        }
+        TAdmin byId = tAdminService.getById(adminId);
+        String companyType = byId.getCompanyType(); // 公司类型
+
+
         // 创建订单
         TCoinOrder tCoinOrder = new TCoinOrder();
         tCoinOrder.setAmount(amount);
@@ -149,6 +170,8 @@ public class AirwallexPayController {
         // 设置订单支付状态,0未支付,1已支付,3已退款。
         tCoinOrder.setStatus("0");
         tCoinOrder.setIsAir("1");
+        tCoinOrder.setMachineType(machineType);
+        tCoinOrder.setCompanyType(companyType);
 
         // 返回payment intent id和client secret
         Map<String, Object> responseMap = airwallexService.caPaymentIntent(amount, currency, requestId, merchantOrderId);
@@ -415,7 +438,6 @@ public class AirwallexPayController {
 //        }
 
 
-
         // 返回 payment_id
         return R.ok(paymentId);
     }

+ 4 - 3
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -1,9 +1,9 @@
 package com.szwl.controller;
 
 
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -11,10 +11,11 @@ import org.springframework.web.bind.annotation.*;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-28
  */
 @RestController
 @RequestMapping("/tCoinOrder")
 public class TCoinOrderController {
+
 }
 

+ 1 - 1
src/main/java/com/szwl/mapper/TCoinOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-28
  */
 public interface TCoinOrderMapper extends BaseMapper<TCoinOrder> {
 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 2 - 11
src/main/java/com/szwl/mapper/xml/TCoinOrderMapper.xml


+ 4 - 1
src/main/java/com/szwl/model/entity/TCoinOrder.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-28
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -160,5 +160,8 @@ public class TCoinOrder implements Serializable {
     @ApiModelProperty(value = "airwallex订单金额,币种为美元")
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "设备类型,0:棉花糖,1,爆米花")
+    private String machineType;
+
 
 }

+ 1 - 2
src/main/java/com/szwl/service/TCoinOrderService.java

@@ -3,14 +3,13 @@ package com.szwl.service;
 import com.szwl.model.entity.TCoinOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-
 /**
  * <p>
  *  服务类
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-28
  */
 public interface TCoinOrderService extends IService<TCoinOrder> {
 

+ 1 - 2
src/main/java/com/szwl/service/impl/TCoinOrderServiceImpl.java

@@ -6,14 +6,13 @@ import com.szwl.service.TCoinOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-
 /**
  * <p>
  *  服务实现类
  * </p>
  *
  * @author wuhs
- * @since 2023-08-10
+ * @since 2023-08-28
  */
 @Service
 public class TCoinOrderServiceImpl extends ServiceImpl<TCoinOrderMapper, TCoinOrder> implements TCoinOrderService {