套餐

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

@@ -111,7 +111,7 @@ public class OrderInfoService {
     */
     public OrderInfo createOrder1(CreateOrder createOrder, Long userId) {
         Package aPackage = packageRepo.findById(createOrder.getPackageId()).orElseThrow(new BusinessException("无套餐"));
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHH");
         String localTime = df.format(LocalDateTime.now());
         String orderNum = String.format("%05d", orderInfoRepo.orderNum() + 1);
         OrderInfo order = OrderInfo.builder()

src/main/java/com/izouma/jiashanxia/web/PackageController.java

@@ -77,11 +77,13 @@ public class PackageController extends BaseController {
         pageQuery.setSort("sort,desc");
         return packageService.all(pageQuery).map(aPackage -> {
             BigDecimal balance = aPackage.getAmount().subtract(aPackage.getSettlementPrice());
+            BigDecimal shareAmount;
             if (aPackage.isSeparateDistribution() && ObjectUtil.isNotNull(aPackage.getPersonalRatio0())) {
-                aPackage.setShareAmount(aPackage.getPersonalRatio0().multiply(balance));
+                shareAmount = aPackage.getPersonalRatio0().multiply(balance).setScale(2, BigDecimal.ROUND_UP);
             } else {
-                aPackage.setShareAmount(personalRatio.multiply(balance));
+                shareAmount = personalRatio.multiply(balance).setScale(2, BigDecimal.ROUND_UP);
             }
+            aPackage.setShareAmount(shareAmount);
             return aPackage;
         });
     }

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

@@ -30,7 +30,7 @@ public class OrderInfoServiceTest {
 
     @Test
     public void completed() {
-        orderInfoService.completed1(1043L, "11000001", PayMethod.WEIXIN);
+        orderInfoService.completed1(1794L, "11000001", PayMethod.WEIXIN);
     }
 
     @Test