commit commit

src/main/java/com/example/afrishop_v3/controllers/OrderController.java

@@ -272,6 +272,15 @@ public class OrderController extends Controller {
             order.setOrderStatus(OrderStatusEnum.CLOSE.getValue());
             order.setRemarkInfo(reason);
 
+            if( order.getCouponId() != null ){
+                Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(order.getCouponId());
+                if ( couponOptional.isPresent() ){
+                    TbCfToicoupon toicoupon = couponOptional.get();
+                    toicoupon.setEnableFlag(1);
+                    toicouponRepository.save(toicoupon);
+                }
+            }
+
             repository.save(order);
 
             return new Result();

src/main/java/com/example/afrishop_v3/models/Bonus.java

@@ -82,7 +82,7 @@ public class Bonus extends Model {
     }
 
     public BigDecimal getAmount() {
-        return amount == null ? BigDecimal.ZERO : amount.setScale(3,RoundingMode.HALF_UP);
+        return amount == null ? BigDecimal.ZERO : amount.setScale(3,RoundingMode.UNNECESSARY);
     }
 
     public void setAmount(BigDecimal amount) {