Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -96,7 +96,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
         if (omsOrderReturnApply == null) {
             throw new BizException("退货订单不存在或被撤销");
         }
-        if (omsOrderReturnApply.getProductPrice().compareTo(statusParam.getReturnAmount()) <0) {
+        if (omsOrderReturnApply.getProductRealPrice().multiply(BigDecimal.valueOf(omsOrderReturnApply.getProductCount())).compareTo(statusParam.getReturnAmount()) <0) {
             throw new BizException("退款金额不能大于商品金额");
         }
         if (omsOrderReturnApply.getStatus().equals(statusParam.getStatus())) {