#2 0元

Слито
licailing слито 5 коммит(ов) из wangqifan/dev в wangqifan/master 3 лет назад

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

@@ -298,7 +298,7 @@ public class OrderService {
                 collectionRepo.setOnShelf(collectionId, false);
             }
             order = orderRepo.save(order);
-            if (order.getTotalPrice().equals(BigDecimal.ZERO)) {
+            if (order.getTotalPrice().compareTo(BigDecimal.ZERO) <= 0) {
                 notifyOrder(order.getId(), PayMethod.WEIXIN, null);
             }
 

+ 0 - 1
src/main/java/com/izouma/nineth/web/ActivityController.java

@@ -33,7 +33,6 @@ public class ActivityController extends BaseController {
         return activityRepo.save(record);
     }
 
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<Activity> all(@RequestBody PageQuery pageQuery) {