Merge branch 'developer' into developerA

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -244,6 +244,9 @@ public class CmRefundsProductController extends BaseController {
                 isPromotions = true;
                 returnedPurchaseFee = MathUtil.sub(returnedPurchaseFee, newOrder.getCouponAmount()).doubleValue();
             }
+            if (null == newOrder.getPromotionFullReduction()) {
+                newOrder.setPromotionFullReduction(0d);
+            }
             returnedPurchaseFee = returnedPurchaseFee - newOrder.getPromotionFullReduction();
             refundFee += getRefundFee(newOrder, returnedPurchaseFee, 1);//运费默认是退的
             cmReturnedPurchase.setRefundFee(refundFee);