| @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxCoupon; | |||||
| import com.iformall.domain.po.WxCouponChannel; | import com.iformall.domain.po.WxCouponChannel; | ||||
| import com.iformall.domain.po.WxCouponPassword; | import com.iformall.domain.po.WxCouponPassword; | ||||
| import com.iformall.domain.po.WxFlowModel; | import com.iformall.domain.po.WxFlowModel; | ||||
| import com.iformall.domain.po.WxFlowRecord; | |||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxMerchantBUser; | import com.iformall.domain.po.WxMerchantBUser; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| @@ -150,13 +151,9 @@ public class WxCouponController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "couponId", value = "编号", dataType = "Long", paramType = "query", required = true)}) | @ApiImplicitParam(name = "couponId", value = "编号", dataType = "Long", paramType = "query", required = true)}) | ||||
| public ResultData flowHistory(Long couponId) { | public ResultData flowHistory(Long couponId) { | ||||
| //wxFlowService.getModelBybusiness(wxFlowModel) | |||||
| if (hasMerchantCouponFlow()) { | |||||
| return new ResultData(1); | |||||
| }else { | |||||
| return new ResultData(0); | |||||
| } | |||||
| WxFlowRecord record = new WxFlowRecord(); | |||||
| record.setBusinessId(String.valueOf(couponId)); | |||||
| return new ResultData(wxFlowService.listAsPage(record, 1, 100)); | |||||
| } | } | ||||