万能券核销

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -675,7 +675,7 @@ public class CouponAdapter {
                         mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
                         mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
                         mcCafeProductRedeemVo.setSeq(i + 1);
-                        if(CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {
+                        if(null != coupon && CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {
                             mcCafeProductRedeemVo.setGid(coupon.getCodeInfo().getGroups().get(0).getGid());
                         }
                         products.add(mcCafeProductRedeemVo);
@@ -695,13 +695,15 @@ public class CouponAdapter {
                 products.add(mcCafeProductRedeemVo);
             }
         } else if (QueryOrderAccountType.FREIGHT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
-            McdNetCouponProductRespDto mcdNetCouponProductRespDto = coupon.getCodeInfo().getProducts().get(0);
-            MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
-            mcCafeProductRedeemVo.setKeyProductCode(mcdNetCouponProductRespDto.getPid());
-            mcCafeProductRedeemVo.setCustomer_code(mcdNetCouponProductRespDto.getPid());
-            mcCafeProductRedeemVo.setConsume_num(mcdNetCouponProductRespDto.getNumber());
-            mcCafeProductRedeemVo.setSeq(1);
-            products.add(mcCafeProductRedeemVo);
+            if(null != coupon) {
+                McdNetCouponProductRespDto mcdNetCouponProductRespDto = coupon.getCodeInfo().getProducts().get(0);
+                MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
+                mcCafeProductRedeemVo.setKeyProductCode(mcdNetCouponProductRespDto.getPid());
+                mcCafeProductRedeemVo.setCustomer_code(mcdNetCouponProductRespDto.getPid());
+                mcCafeProductRedeemVo.setConsume_num(mcdNetCouponProductRespDto.getNumber());
+                mcCafeProductRedeemVo.setSeq(1);
+                products.add(mcCafeProductRedeemVo);
+            }
         }
         MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest();
         mcCafeCouponRequest.setVer(Integer.valueOf(Version.VERSION_1));

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -94,7 +94,7 @@ public class McCafeCouponAdapter {
                         mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
                         mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
                         mcCafeProductRedeemVo.setSeq(i + 1);
-                        if(CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {
+                        if(null != coupon && CollectionUtils.isNotEmpty(coupon.getCodeInfo().getGroups())) {
                             mcCafeProductRedeemVo.setGid(coupon.getCodeInfo().getGroups().get(0).getGid());
                         }
                         products.add(mcCafeProductRedeemVo);