|
|
|
@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.po.tt.TtCoupon; |
|
|
|
import com.iformall.domain.po.tt.TtUserCollect; |
|
|
|
@@ -122,8 +123,11 @@ public class TtCouponServiceImpl implements TtCouponService { |
|
|
|
if(byId == null){ |
|
|
|
return byId; |
|
|
|
} |
|
|
|
byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); |
|
|
|
if(byId.getType().equals(EnumTtCouponType.COUPON_MORE.getCode())){ |
|
|
|
WxMerchant author = wxMerchantService.getById(byId.getMerchantId()); |
|
|
|
byId.setMerchantName(author.getName()); |
|
|
|
byId.setMerchantPic(author.getImgUrl()); |
|
|
|
// byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); |
|
|
|
if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ |
|
|
|
TtCoupon couponQ = new TtCoupon(); |
|
|
|
couponQ.setColumnId(productId); |
|
|
|
couponQ.setType(EnumTtCouponType.COUPON_MORE.getCode()); |
|
|
|
|