|
|
|
@@ -16,7 +16,6 @@ import com.iformall.enums.EnumTtCouponStatus; |
|
|
|
import com.iformall.enums.EnumTtCouponType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.tt.TtCouponService; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
@@ -39,7 +38,7 @@ public class TtCouponServiceImpl implements TtCouponService { |
|
|
|
TtCouponMapper ttCouponMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxMerchantService wxMerchantService; |
|
|
|
WxMerchantMapper wxMerchantMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
TtUserCollectMapper ttUserCollectMapper; |
|
|
|
@@ -133,10 +132,11 @@ public class TtCouponServiceImpl implements TtCouponService { |
|
|
|
if(byId == null){ |
|
|
|
return byId; |
|
|
|
} |
|
|
|
// WxMerchant author = wxMerchantService.getById(byId.getMerchantId()); |
|
|
|
// WxMerchant author = wxMerchantMapper.selectById(byId.getMerchantId()); |
|
|
|
// byId.setMerchantName(author.getName()); |
|
|
|
// byId.setMerchantPic(author.getImgUrl()); |
|
|
|
byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); |
|
|
|
|
|
|
|
byId.setAuthor(wxMerchantMapper.selectById(byId.getMerchantId())); |
|
|
|
if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ |
|
|
|
TtCoupon couponQ = new TtCoupon(); |
|
|
|
couponQ.setColumnId(productId); |
|
|
|
|