Skip to content

O
order-group
Commit 3f29a37b by 徐康
Options

万能券核销

parent 586e82f6
Showing with 11 additions and 9 deletions
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
...@@ -675,7 +675,7 @@ public class CouponAdapter { ...@@ -675,7 +675,7 @@ public class CouponAdapter {
mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode()); mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty()); mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
mcCafeProductRedeemVo.setSeq(i + 1); 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()); mcCafeProductRedeemVo.setGid(coupon.getCodeInfo().getGroups().get(0).getGid());
} }
products.add(mcCafeProductRedeemVo); products.add(mcCafeProductRedeemVo);
...@@ -695,13 +695,15 @@ public class CouponAdapter { ...@@ -695,13 +695,15 @@ public class CouponAdapter {
products.add(mcCafeProductRedeemVo); products.add(mcCafeProductRedeemVo);
} }
} else if (QueryOrderAccountType.FREIGHT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) { } else if (QueryOrderAccountType.FREIGHT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
McdNetCouponProductRespDto mcdNetCouponProductRespDto = coupon.getCodeInfo().getProducts().get(0); if(null != coupon) {
MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo(); McdNetCouponProductRespDto mcdNetCouponProductRespDto = coupon.getCodeInfo().getProducts().get(0);
mcCafeProductRedeemVo.setKeyProductCode(mcdNetCouponProductRespDto.getPid()); MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
mcCafeProductRedeemVo.setCustomer_code(mcdNetCouponProductRespDto.getPid()); mcCafeProductRedeemVo.setKeyProductCode(mcdNetCouponProductRespDto.getPid());
mcCafeProductRedeemVo.setConsume_num(mcdNetCouponProductRespDto.getNumber()); mcCafeProductRedeemVo.setCustomer_code(mcdNetCouponProductRespDto.getPid());
mcCafeProductRedeemVo.setSeq(1); mcCafeProductRedeemVo.setConsume_num(mcdNetCouponProductRespDto.getNumber());
products.add(mcCafeProductRedeemVo); mcCafeProductRedeemVo.setSeq(1);
products.add(mcCafeProductRedeemVo);
}
} }
MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest(); MCCafeCouponRequest mcCafeCouponRequest = new MCCafeCouponRequest();
mcCafeCouponRequest.setVer(Integer.valueOf(Version.VERSION_1)); 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 { ...@@ -94,7 +94,7 @@ public class McCafeCouponAdapter {
mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode()); mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty()); mcCafeProductRedeemVo.setConsume_num(productDiscount.getDiscountQty());
mcCafeProductRedeemVo.setSeq(i + 1); 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()); mcCafeProductRedeemVo.setGid(coupon.getCodeInfo().getGroups().get(0).getGid());
} }
products.add(mcCafeProductRedeemVo); products.add(mcCafeProductRedeemVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment