xiongzhu há 4 anos atrás
pai
commit
70ef5038ac

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

@@ -391,7 +391,7 @@ public class OrderService {
             userRepo.findById(order.getInvitor()).ifPresent(user -> {
                 BigDecimal shareRatio = user.getShareRatio();
                 if (shareRatio != null && shareRatio.compareTo(BigDecimal.ZERO) > 0) {
-                    BigDecimal totalPrice = order.getTotalPrice().min(order.getGasPrice());
+                    BigDecimal totalPrice = order.getTotalPrice().subtract(order.getGasPrice());
                     commissionRecordRepo.save(CommissionRecord.builder()
                             .orderId(order.getId())
                             .totalPrice(totalPrice)

+ 8 - 0
src/test/java/com/izouma/nineth/service/OrderServiceTest.java

@@ -4,6 +4,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.repo.OrderRepo;
 import org.apache.commons.codec.EncoderException;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class OrderServiceTest extends ApplicationTests {
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private OrderRepo    orderRepo;
 
     @Test
     public void create() throws EncoderException, WxPayException {
@@ -27,4 +30,9 @@ public class OrderServiceTest extends ApplicationTests {
     public void setSales() {
         orderService.setSales();
     }
+
+    @Test
+    public void commission() {
+        orderService.commission(orderRepo.findById(4437L).get());
+    }
 }