Skip to content

O
order-group
Commit 61c44d7d by 徐康
Options

核销万能券

parent 71d91a5b
Showing with 10 additions and 25 deletions
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
...@@ -672,19 +672,11 @@ public class CouponAdapter { ...@@ -672,19 +672,11 @@ public class CouponAdapter {
} }
MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo(); MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
mcCafeProductRedeemVo.setPid(pid); mcCafeProductRedeemVo.setPid(pid);
String extInfo = null; String extInfo = productDiscount.getAddInfo();
if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) { Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
if(discount.getDiscountId().equals(accountBean.getAccountId())) {
extInfo = discount.getAddInfo();
break;
}
}
}
Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
if(extendType != null && extendType == 4) { if(extendType != null && extendType == 4) {
mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId")); mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId")); mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).getString("tenderId"));
} else { } else {
mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode()); mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode()); mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
......
order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
...@@ -162,6 +162,8 @@ public class CouponClientServiceImpl implements CouponClientService { ...@@ -162,6 +162,8 @@ public class CouponClientServiceImpl implements CouponClientService {
@Override @Override
public List<CouponRedeemResponse> redeemBatch(QueryOrdersResponseDto.DataBean.OrderBean orderBean) { public List<CouponRedeemResponse> redeemBatch(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
System.out.println("=======================================================================");
System.out.println(JSON.toJSONString(orderBean));
if (null == orderBean || CollectionUtils.isEmpty(orderBean.getAccountList())) { if (null == orderBean || CollectionUtils.isEmpty(orderBean.getAccountList())) {
return null; return null;
} }
......
order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java
...@@ -91,20 +91,11 @@ public class McCafeCouponAdapter { ...@@ -91,20 +91,11 @@ public class McCafeCouponAdapter {
} }
MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo(); MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();
mcCafeProductRedeemVo.setPid(pid); mcCafeProductRedeemVo.setPid(pid);
String extInfo = productDiscount.getAddInfo();
String extInfo = null; Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(extInfo).getInteger("extendType");
if(CollectionUtils.isNotEmpty(productBean.getDiscountList())) {
for (QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount discount : productBean.getDiscountList()) {
if(discount.getDiscountId().equals(accountBean.getAccountId())) {
extInfo = discount.getAddInfo();
break;
}
}
}
Integer extendType = StringUtils.isBlank(extInfo)?null: JSON.parseObject(accountBean.getAddInfo()).getInteger("extendType");
if(extendType != null && extendType == 4) { if(extendType != null && extendType == 4) {
mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId")); mcCafeProductRedeemVo.setKeyProductCode(JSON.parseObject(extInfo).getString("tenderId"));
mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(accountBean.getAddInfo()).getString("tenderId")); mcCafeProductRedeemVo.setCustomer_code(JSON.parseObject(extInfo).getString("tenderId"));
} else { } else {
mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode()); mcCafeProductRedeemVo.setKeyProductCode(productBean.getCustomerCode());
mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode()); mcCafeProductRedeemVo.setCustomer_code(productBean.getCustomerCode());
......
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