升级超级会员支付

src/main/java/com/caimei365/order/controller/PayNonOrderApi.java

@@ -124,6 +124,9 @@ public class PayNonOrderApi {
         if (null == payVipDto.getUserId()) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
+        if (null == payVipDto.getVipId()) {
+            return ResponseJson.error("会员套餐Id不能为空！", null);
+        }
         if (StringUtils.isEmpty(payVipDto.getCode())) {
             return ResponseJson.error("微信code不能为空！", null);
         }
@@ -144,6 +147,9 @@ public class PayNonOrderApi {
         if (null == payVipDto.getUserId()) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
+        if (null == payVipDto.getVipId()) {
+            return ResponseJson.error("会员套餐Id不能为空！", null);
+        }
         if (StringUtils.isEmpty(payVipDto.getReturnUrl())) {
             return ResponseJson.error("回调地址不能为空！", null);
         }
@@ -166,6 +172,9 @@ public class PayNonOrderApi {
         if (null == payVipDto.getUserId()) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
+        if (null == payVipDto.getVipId()) {
+            return ResponseJson.error("会员套餐Id不能为空！", null);
+        }
         if (StringUtils.isEmpty(payVipDto.getReturnUrl())) {
             return ResponseJson.error("回调地址不能为空！", null);
         }

src/main/resources/mapper/SubmitMapper.xml

@@ -33,7 +33,7 @@
                                     totalAmount, totalFee, shouldPayFee, productUnit, num, presentNum, discountFee, includedTax,
                                     invoiceType, taxRate, addedValueTax, totalAddedValueTax, singleShouldPayTotalTax, shouldPayTotalTax,
                                     shopProductAmount, singleShopFee, shopFee, singleOtherFee, otherFee, singleCmFee, cmFee,
-                                    payStatus, buyAgainFlag, notOutStore, isActProduct, productType)
+                                    payStatus, buyAgainFlag, , isActProduct, productType)
         VALUES (#{orderId},#{orderNo},#{shopOrderId},#{shopOrderNo},#{orderPromotionsId},#{productId},#{shopId},#{name},
                 #{image},#{price},#{price},#{shopName},#{costPrice},#{normalPrice},#{ladderPriceFlag},#{discountPrice},#{discount},
                 #{totalAmount},#{totalFee},#{shouldPayFee},#{productUnit},#{num},#{presentNum},#{discountFee},#{includedTax},