Преглед изворни кода

[券][添加][拼团下架]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
802521f215
5 измењених фајлова са 35 додато и 7 уклоњено
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  3. +9
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  4. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +11
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java Прегледај датотеку

@@ -45,4 +45,7 @@ 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);

} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxOrderService.java Прегледај датотеку

@@ -161,4 +161,6 @@ public interface WxOrderService {


void updateOrderStatus(WxOrder order); void updateOrderStatus(WxOrder order);


void updateOrderGroupStatusByCouponId(Long id, String tenantId, Integer code);

} }

+ 9
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Прегледај датотеку

@@ -1,18 +1,15 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import java.util.*;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
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.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.WxCouponMerchant;
import com.iformall.domain.po.WxScreenAd;
import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponCVo;
import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxMerchantVo;
@@ -27,11 +24,16 @@ 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 org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;



@Service @Service
public class WxCouponServiceImpl implements WxCouponService { public class WxCouponServiceImpl implements WxCouponService {
@@ -302,6 +304,8 @@ public class WxCouponServiceImpl implements WxCouponService {
wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); wxOrderService.updateStatusByPressCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode());
//下架所有相关广告 //下架所有相关广告
wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode()); wxScreenAdService.updateStatusByCouponId(record.getId(), record.getTenantId(), EnumScreenAdStatus.INVALID.getCode());
//下架拼团券
wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
} }
record.setUpdateDate(new Date()); record.setUpdateDate(new Date());
wxCouponMapper.updateByPrimaryKeySelective(record); wxCouponMapper.updateByPrimaryKeySelective(record);


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Прегледај датотеку

@@ -1020,6 +1020,16 @@ 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);
}

/** /**
* 微信关闭订单 * 微信关闭订单
*/ */


+ 11
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Прегледај датотеку

@@ -202,8 +202,17 @@
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}
where product_id=#{productId} 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"/>


Loading…
Откажи
Сачувај