Browse Source

order gift for free

wangqifan 3 years ago
parent
commit
0d8def2076
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/main/java/com/izouma/nineth/service/SandPayService.java

+ 6 - 1
src/main/java/com/izouma/nineth/service/SandPayService.java

@@ -9,6 +9,7 @@ import com.izouma.nineth.domain.MintOrder;
 import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.enums.MintOrderStatus;
 import com.izouma.nineth.enums.MintOrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.enums.PayMethod;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.GiftOrderRepo;
 import com.izouma.nineth.repo.GiftOrderRepo;
 import com.izouma.nineth.repo.MintOrderRepo;
 import com.izouma.nineth.repo.MintOrderRepo;
@@ -43,6 +44,7 @@ public class SandPayService {
     private final MintOrderRepo     mintOrderRepo;
     private final MintOrderRepo     mintOrderRepo;
     private final SnowflakeIdWorker snowflakeIdWorker;
     private final SnowflakeIdWorker snowflakeIdWorker;
     private final GeneralProperties generalProperties;
     private final GeneralProperties generalProperties;
+    private final GiftOrderService  giftOrderService;
 
 
     public String paddingOrderId(String orderId) {
     public String paddingOrderId(String orderId) {
         if (orderId != null && orderId.length() < 12) {
         if (orderId != null && orderId.length() < 12) {
@@ -377,6 +379,10 @@ public class SandPayService {
         if (order.getStatus() != OrderStatus.NOT_PAID) {
         if (order.getStatus() != OrderStatus.NOT_PAID) {
             throw new BusinessException("订单状态错误");
             throw new BusinessException("订单状态错误");
         }
         }
+        if (order.getGasPrice().compareTo(BigDecimal.ZERO) == 0) {
+            giftOrderService.giftNotify(orderId, PayMethod.ALIPAY, "1");
+            return "";
+        }
         JSONObject extend = new JSONObject();
         JSONObject extend = new JSONObject();
         extend.put("type", "gift");
         extend.put("type", "gift");
         extend.put("id", orderId);
         extend.put("id", orderId);
@@ -431,7 +437,6 @@ public class SandPayService {
     }
     }
 
 
 
 
-
     public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
     public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
         JSONObject request = new JSONObject();
         JSONObject request = new JSONObject();
         DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));
         DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));