# Conflicts: # mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java # mallinkService/src/main/java/com/iformall/service/WxOrderService.java # mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java # mallinkService/src/main/resources/mapper/WxOrderMapper.xmlrelease_toaliyun_real
| @@ -45,4 +45,9 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> { | |||||
| void updateStatusByPressCouponId(WxOrder wxOrder); | void updateStatusByPressCouponId(WxOrder wxOrder); | ||||
| void updateStatusByOrderGroupId(WxOrder order); | void updateStatusByOrderGroupId(WxOrder order); | ||||
| void updateOrderGroupStatusByCouponId(WxOrder updateOrder); | |||||
| void updateOrderGroupStatusByCouponChannelId(WxOrder updateOrder); | |||||
| } | } | ||||
| @@ -161,4 +161,8 @@ public interface WxOrderService { | |||||
| void updateOrderStatus(WxOrder order); | void updateOrderStatus(WxOrder order); | ||||
| void updateOrderGroupStatusByCouponId(Long id, String tenantId, Integer code); | |||||
| void updateOrderGroupStatusByCouponChannelId(Long id, String tenantId, Integer code); | |||||
| } | } | ||||
| @@ -1,17 +1,12 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import java.util.*; | |||||
| import java.util.stream.Collectors; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.Result; | |||||
| import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.WxCouponChannel; | import com.iformall.domain.po.WxCouponChannel; | ||||
| import com.iformall.domain.po.WxCouponMerchant; | |||||
| import com.iformall.domain.po.WxMerchant; | |||||
| import com.iformall.domain.vo.WxCouponCVo; | import com.iformall.domain.vo.WxCouponCVo; | ||||
| import com.iformall.domain.vo.WxCouponChannelAddVo; | import com.iformall.domain.vo.WxCouponChannelAddVo; | ||||
| import com.iformall.domain.vo.WxCouponChannelVo; | import com.iformall.domain.vo.WxCouponChannelVo; | ||||
| @@ -22,12 +17,14 @@ import com.iformall.mapper.WxCouponMerchantMapper; | |||||
| import com.iformall.mapper.WxMerchantMapper; | import com.iformall.mapper.WxMerchantMapper; | ||||
| import com.iformall.service.WxCouponChannelService; | import com.iformall.service.WxCouponChannelService; | ||||
| import com.iformall.service.WxCouponService; | import com.iformall.service.WxCouponService; | ||||
| import com.iformall.service.WxOrderService; | |||||
| import com.iformall.service.WxScreenAdService; | import com.iformall.service.WxScreenAdService; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import com.iformall.common.IdWorker; | |||||
| import java.util.*; | |||||
| @Service | @Service | ||||
| public class WxCouponChannelServiceImpl implements WxCouponChannelService { | public class WxCouponChannelServiceImpl implements WxCouponChannelService { | ||||
| @@ -43,6 +40,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| WxCouponMerchantMapper wxCouponMerchantMapper; | WxCouponMerchantMapper wxCouponMerchantMapper; | ||||
| @Autowired | @Autowired | ||||
| WxScreenAdService wxScreenAdService; | WxScreenAdService wxScreenAdService; | ||||
| @Autowired | |||||
| WxOrderService wxOrderService; | |||||
| /** | /** | ||||
| * B端业务端 | * B端业务端 | ||||
| * @param record | * @param record | ||||
| @@ -97,6 +96,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) | if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()) | ||||
| && record.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { | && record.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode())) { | ||||
| wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record.getTenantId(),EnumScreenAdStatus.INVALID.getCode()); | wxScreenAdService.updateStatusByCouponChannelId(record.getId(),record.getTenantId(),EnumScreenAdStatus.INVALID.getCode()); | ||||
| //下架拼团券 | |||||
| wxOrderService.updateOrderGroupStatusByCouponChannelId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); | |||||
| } | } | ||||
| } | } | ||||
| wxCouponChannelMapper.updateByPrimaryKeySelective(record); | wxCouponChannelMapper.updateByPrimaryKeySelective(record); | ||||
| @@ -370,7 +370,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| WxOrder order = new WxOrder(); | WxOrder order = new WxOrder(); | ||||
| order.setOrderGroupId(group.getId()); | order.setOrderGroupId(group.getId()); | ||||
| order.setCUserId(user.getId()); | order.setCUserId(user.getId()); | ||||
| int count = wxOrderMapper.selectCount(order); | |||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); | |||||
| long count = wxOrderMapper.selectCount(order); | |||||
| if (count > 0) { | if (count > 0) { | ||||
| logger.error("重复的拼团>>>" + orderGroupId); | logger.error("重复的拼团>>>" + orderGroupId); | ||||
| throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_UNPAID); | throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_UNPAID); | ||||
| @@ -1035,6 +1036,26 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| } | } | ||||
| @Override | |||||
| public void updateOrderGroupStatusByCouponId(Long couponId, String tenantId, Integer orderStatus) { | |||||
| WxOrder updateOrder = new WxOrder(); | |||||
| updateOrder.setTenantId(tenantId); | |||||
| updateOrder.setOrderStatus(orderStatus); | |||||
| updateOrder.setProductId(couponId); | |||||
| updateOrder.setUpdateDate(new Date()); | |||||
| wxOrderMapper.updateOrderGroupStatusByCouponId(updateOrder); | |||||
| } | |||||
| @Override | |||||
| public void updateOrderGroupStatusByCouponChannelId(Long couponChannelId, String tenantId, Integer orderStatus) { | |||||
| WxOrder updateOrder = new WxOrder(); | |||||
| updateOrder.setTenantId(tenantId); | |||||
| updateOrder.setOrderStatus(orderStatus); | |||||
| updateOrder.setCouponChannelId(couponChannelId); | |||||
| updateOrder.setUpdateDate(new Date()); | |||||
| wxOrderMapper.updateOrderGroupStatusByCouponChannelId(updateOrder); | |||||
| } | |||||
| /** | /** | ||||
| * 微信关闭订单 | * 微信关闭订单 | ||||
| */ | */ | ||||
| @@ -202,8 +202,25 @@ | |||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| </update> | </update> | ||||
| <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxOrderCouponVo"> | |||||
| <update id="updateOrderGroupStatusByCouponId" parameterType="com.iformall.domain.po.WxOrder"> | |||||
| update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | |||||
| where product_id=#{productId} and order_status = 10 | |||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| </update> | |||||
| <update id="updateOrderGroupStatusByCouponChaneelId" parameterType="com.iformall.domain.po.WxOrder"> | |||||
| update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | |||||
| where coupon_channel_id=#{couponChannelId} and order_status = 10 | |||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| </update> | |||||
| <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxOrderCouponVo"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="order_number" jdbcType="BIGINT" property="orderNumber"/> | <result column="order_number" jdbcType="BIGINT" property="orderNumber"/> | ||||