|
|
|
@@ -285,7 +285,7 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
@TenantIgnore |
|
|
|
@ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") |
|
|
|
@ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\",\"couponTenantId\":\"string\"}") |
|
|
|
@PostMapping("verify") |
|
|
|
public ResultData verify(@RequestBody Map<String, String> paramMap) { |
|
|
|
logger.info("couponOrderController.verify:" + paramMap.toString()); |
|
|
|
@@ -319,14 +319,16 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
|
|
|
|
WxCouponOrderCVo wxCouponOrderCVo = null; |
|
|
|
if (tenantEntity.isChildMall()) { |
|
|
|
//查询父 |
|
|
|
TenantEntity parentTenant = new TenantEntity(); |
|
|
|
parentTenant.setTenantId(tenantEntity.getParentTenantId()); |
|
|
|
parentTenant.setParentTenantId(null); |
|
|
|
wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,parentTenant); |
|
|
|
}else { |
|
|
|
String couponTenantId = paramMap.get("couponTenantId"); |
|
|
|
TenantEntity parentTenantEntity = null; |
|
|
|
if (StringUtils.isBlank(couponTenantId) || "null".equals(couponTenantId) || "NULL".equals(couponTenantId)) { |
|
|
|
wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,tenantEntity); |
|
|
|
}else { |
|
|
|
//查询父 |
|
|
|
parentTenantEntity = new TenantEntity(); |
|
|
|
parentTenantEntity.setTenantId(couponTenantId); |
|
|
|
parentTenantEntity.setParentTenantId(null); |
|
|
|
wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,parentTenantEntity); |
|
|
|
} |
|
|
|
|
|
|
|
if (wxCouponOrderCVo == null) |
|
|
|
@@ -368,8 +370,8 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
WxCouponOrder wxCouponOrder = null; |
|
|
|
if (tenantEntity.isChildMall()) { |
|
|
|
wxCouponOrder = wxCouponOrderService.getById(couponOrderId,tenantEntity.getParentTenantId()); |
|
|
|
if (null != parentTenantEntity ) { |
|
|
|
wxCouponOrder = wxCouponOrderService.getById(couponOrderId,parentTenantEntity.getTenantId()); |
|
|
|
}else { |
|
|
|
wxCouponOrder = wxCouponOrderService.getById(couponOrderId,tenantEntity.getTenantId()); |
|
|
|
} |
|
|
|
|