diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java index 200d35d56..eb528f3cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java @@ -141,6 +141,10 @@ public class TtCoupon extends TenantEntity { @TableField(exist = false) private List columnCoupons; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="是否可观看",name="view") + private boolean view; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") private Map flowParams; diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java index 7c65a73b5..dc6d3b5d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java @@ -29,4 +29,6 @@ public interface TtOrderService { ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId, WxAppinfo appinfo); ResultData updateOrderStatus(TenantEntity tenantInfo, Long orderId, Long memberId, WxAppinfo cAppInfo); + + boolean isByMember(Long memberId, Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 8db727596..e7deeedea 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -313,4 +313,19 @@ public class TtOrderServiceImpl implements TtOrderService { return new ResultData(); } + @Override + public boolean isByMember(Long memberId, Long id) { + TtOrder orderQ = new TtOrder(); + orderQ.setCUserId(memberId); + orderQ.setProductId(id); + List statuss = new ArrayList<>(); + statuss.add(EnumTtOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + orderQ.setStatusS(statuss); + int listCount = ttOrderMapper.findListCount(orderQ); + if(listCount > 0){ + return true; + } + return false; + } + } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java index a7dc4526a..dc89b1944 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java @@ -5,9 +5,11 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.tt.TtCoupon; import com.iformall.enums.EnumTtCouponStatus; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.service.WxMerchantService; import com.iformall.service.tt.TtCouponService; +import com.iformall.service.tt.TtOrderService; import com.iformall.video.VideoFactory; import com.iformall.video.entity.VideUploadResult; import io.swagger.annotations.Api; @@ -32,6 +34,9 @@ public class TtCouponController extends BaseController { @Autowired private WxMerchantService wxMerchantService; + @Autowired + private TtOrderService ttOrderService; + @Autowired private VideoFactory videoFactory; @@ -58,8 +63,25 @@ public class TtCouponController extends BaseController { if (id == null) { return new ResultData(ResultData.ERROR, "缺少id"); } + TtCoupon detail = ttCouponService.detail(id); + if(detail == null){ + new ResultData(); + } + if(detail.getIsPayment().equals(EnumYesOrNo.YES.getCode())){ + try { + if(ttOrderService.isByMember(getMemberId(),id)){ + detail.setView(true); + }else{ + detail.setView(false); + } + } catch (MallinkException e) { + detail.setView(false); + } + }else{ + detail.setView(true); + } ttCouponService.addSeeCount(id); - return new ResultData(ttCouponService.detail(id)); + return new ResultData(detail); } @GetMapping(value = "/videoDetial")