|
|
@@ -123,9 +123,9 @@ public class TtCouponServiceImpl implements TtCouponService { |
|
|
if(byId == null){ |
|
|
if(byId == null){ |
|
|
return byId; |
|
|
return byId; |
|
|
} |
|
|
} |
|
|
WxMerchant author = wxMerchantService.getById(byId.getMerchantId()); |
|
|
|
|
|
byId.setMerchantName(author.getName()); |
|
|
|
|
|
byId.setMerchantPic(author.getImgUrl()); |
|
|
|
|
|
|
|
|
// WxMerchant author = wxMerchantService.getById(byId.getMerchantId()); |
|
|
|
|
|
// byId.setMerchantName(author.getName()); |
|
|
|
|
|
// byId.setMerchantPic(author.getImgUrl()); |
|
|
// byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); |
|
|
// byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); |
|
|
if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ |
|
|
if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ |
|
|
TtCoupon couponQ = new TtCoupon(); |
|
|
TtCoupon couponQ = new TtCoupon(); |
|
|
|