Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -3162,7 +3162,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
     private BigDecimal getBigDecimal(ConsumerSecondaryCard consumerSecondaryCard,
                                      ComputedOrderPriceResponse priceResponse, SPack byId, BigDecimal payPrice) {
-        if (Integer.getInteger(byId.getDuration()) > (consumerSecondaryCard.getSingleDuration()) && consumerSecondaryCard.getSingleAmount().compareTo(byId.getPrice()) > 0) {
+        if (Integer.valueOf(byId.getDuration()) > (consumerSecondaryCard.getSingleDuration()) && consumerSecondaryCard.getSingleAmount().compareTo(byId.getPrice()) > 0) {
             priceResponse.setDiscount(BigDecimal.ZERO);
             priceResponse.setMemberDiscount(BigDecimal.ZERO);
             priceResponse.setTotalFeeNow(BigDecimal.ZERO);