|
@@ -2011,7 +2011,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//特殊渠道推广优惠. 360
|
|
//特殊渠道推广优惠. 360
|
|
|
if (orderDon.getPopularizeId() != null && orderDon.getPopularizeId() != 0L) {
|
|
if (orderDon.getPopularizeId() != null && orderDon.getPopularizeId() != 0L) {
|
|
|
//使用了优惠券 不再使用360渠道 折扣
|
|
//使用了优惠券 不再使用360渠道 折扣
|
|
|
- if (couponUser == null) {
|
|
|
|
|
|
|
+ if (couponUser == null && goodsType == 1) {
|
|
|
String name = channelPopularizeMapper.selectChannelByPid(orderDon.getPopularizeId());
|
|
String name = channelPopularizeMapper.selectChannelByPid(orderDon.getPopularizeId());
|
|
|
if (Constant.CHANNEL_NAME_360.equals(name)) {
|
|
if (Constant.CHANNEL_NAME_360.equals(name)) {
|
|
|
SysConfig sysConfig = sysConfigService.getBaseMapper().selectOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, Constant.CHANNEL_360_DISCOUNT));
|
|
SysConfig sysConfig = sysConfigService.getBaseMapper().selectOne(Wrappers.lambdaQuery(SysConfig.class).eq(SysConfig::getSysKey, Constant.CHANNEL_360_DISCOUNT));
|