Merge branch 'dev' into 'mp-server-test'

回收盲豆

See merge request quanshu/mp-server!924

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserPrizeRecoveryController.java

@@ -137,6 +137,10 @@ public class UserPrizeRecoveryController extends BaseApiController {
             exchangePrice = goods.getExchangePrice();
         }
 
+        if (BigDecimal.ZERO.equals(discountRate)) {
+            return AjaxResult.error("该商品不支持回收");
+        }
+
         int returnNum = BigDecimal.valueOf((long) exchangePrice * param.getNum()).multiply(discountRate).divide(BigDecimal.valueOf(100),0, RoundingMode.HALF_UP).intValue();
 
         settleVO.setReturnCoin(returnNum);