Merge branch 'dev-coupon-recommend' into test6.9.6

@@ -165,22 +165,24 @@ public class ChargeService {
     private void calculateCouponIfNeed(ChargeContext chargeContext) {
     private void calculateCouponIfNeed(ChargeContext chargeContext) {
         ChargeParam chargeParam = chargeContext.getChargeParam();
         ChargeParam chargeParam = chargeContext.getChargeParam();
         List<String> couponCodes = chargeParam.getCouponCodes();
         List<String> couponCodes = chargeParam.getCouponCodes();
-        if (CollectionUtils.isEmpty(couponCodes)) {
-            return;
-        }
 
 
         switch (chargeParam.getChargeStage()) {
         switch (chargeParam.getChargeStage()) {
-            case PAYMENT:
+            case PAYMENT: {
                 //自动匹配
                 //自动匹配
-                calculateRecommendedCoupons( chargeContext);
+                calculateRecommendedCoupons(chargeContext);
                 break;
                 break;
+            }
             case SELECT_COUPON:
             case SELECT_COUPON:
                 calculateSelectCoupons(chargeContext);
                 calculateSelectCoupons(chargeContext);
                 break;
                 break;
             case COMPUTE:
             case COMPUTE:
-            case SUBMIT:
+            case SUBMIT: {
+                if (CollectionUtils.isEmpty(couponCodes)) {
+                    return;
+                }
                 calculateSpecifiedCoupons(chargeContext);
                 calculateSpecifiedCoupons(chargeContext);
                 break;
                 break;
+            }
             default:
             default:
                 throw new UfoServiceException(500, "unknown chargeStage " + chargeParam.getChargeStage());
                 throw new UfoServiceException(500, "unknown chargeStage " + chargeParam.getChargeStage());
         }
         }