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

优化

See merge request quanshu/mp-server!997

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

@@ -171,6 +171,10 @@ public class UserPrizeRecoveryController extends BaseApiController {
             return AjaxResult.error("订单已过期，请重新下单");
         }
 
+        if (settleVO.getReturnCoin() <= 0) {
+            return AjaxResult.error("该商品不支持回收");
+        }
+
         prizeRecoveryService.submitRecovery(userId, settleVO);
 
         // 清除缓存的回收订单