bug

src/main/java/com/izouma/jiashanxia/service/OrderInfoService.java

@@ -498,13 +498,14 @@ public class OrderInfoService {
                     // 二级收益暂存
 //                    user.setCacheAmount(user.getCacheAmount().add(amount));
                 }
-                if (BigDecimal.ZERO.compareTo(amount) <= 0) {
+                if (BigDecimal.ZERO.compareTo(amount) >= 0) {
                     return;
                 }
                 commission.setAmount(amount);
                 commissionRecordRepo.save(commission);
                 break;
             case BIG_EXPERT:
+            case PARTNER:
                 if (level == 1) {
                     if (separateDis && ObjectUtil.isNotEmpty(aPackage.getBigExpertRatio0())) {
                         amount = balance.multiply(aPackage.getBigExpertRatio0());
@@ -520,7 +521,7 @@ public class OrderInfoService {
                         amount = balance.multiply(personalRatio1);
                     }
                 }
-                if (BigDecimal.ZERO.compareTo(amount) <= 0) {
+                if (BigDecimal.ZERO.compareTo(amount) >= 0) {
                     return;
                 }
 //                user.setAmount(user.getAmount().add(amount));

src/main/vue/src/components/PackageEdit.vue

@@ -273,7 +273,7 @@
                     name="poster"
                 >
                     <div slot="tips" class="tips">尺寸120x240px</div>
-                </poster-upload> 
+                </poster-upload>
                 <crop-upload v-model="formData.poster"></crop-upload>
             </el-form-item> -->
             <!-- <el-form-item label="分享图" prop="smallPoster">
@@ -566,6 +566,7 @@ export default {
                 });
                 data.originalPrice = minStock[0].originalPrice;
                 data.amount = minStock[0].price;
+                data.settlementPrice = minStock[0].settlementPrice;
             }
             if (typeof data.note === 'undefined') {
                 data.note = this.note;

src/test/java/com/izouma/jiashanxia/service/OrderInfoServiceTest.java

@@ -5,6 +5,8 @@ import com.izouma.jiashanxia.dto.CreateOrder;
 import com.izouma.jiashanxia.dto.OrderInfoVO;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.enums.PayMethod;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.OrderInfoRepo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@ public class OrderInfoServiceTest {
 
     @Autowired
     private OrderInfoService orderInfoService;
+    @Autowired
+    private OrderInfoRepo    orderInfoRepo;
 
     @Test
     public void order() {
@@ -97,4 +101,10 @@ public class OrderInfoServiceTest {
     public void test3() {
         orderInfoService.batchByCart(Collections.singletonList(1536L));
     }
+
+    @Test
+    public void test4() {
+        OrderInfo orderInfo = orderInfoRepo.findById(1835L).orElseThrow(new BusinessException("wu"));
+        orderInfoService.distribution3(orderInfo);
+    }
 }