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

//tuikuan

release_toaliyun_real
xhxu пре 3 година
родитељ
комит
7648ff6c8b
6 измењених фајлова са 19 додато и 2 уклоњено
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  6. +7
    -0
      mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Прегледај датотеку

@@ -295,7 +295,7 @@ public class WxCouponOrderController extends BaseController {
res.put("valuable", valuable); res.put("valuable", valuable);
res.put("outOrderId",couponOrder.getComposeOrderId()); res.put("outOrderId",couponOrder.getComposeOrderId());
if(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode().equals(couponOrder.getCouponOrderStatus()) && valuable){ if(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode().equals(couponOrder.getCouponOrderStatus()) && valuable){
WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), couponOrder.getOrderId());
WxRefundOrder refundOrder = wxRefundOrderService.findRefundStatus(getTenantInfo(), couponOrder.getOrderId());
if(refundOrder != null){ if(refundOrder != null){
res.put("outRefundOrderId",refundOrder.getId()); res.put("outRefundOrderId",refundOrder.getId());
res.put("refundOrderStatus",refundOrder.getRefundOrderStatus()); res.put("refundOrderStatus",refundOrder.getRefundOrderStatus());


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Прегледај датотеку

@@ -708,7 +708,7 @@ public class WxOrderController extends BaseController {
if(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus()) if(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus())
|| EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode().equals(wxOrder.getOrderStatus()) || EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode().equals(wxOrder.getOrderStatus())
|| EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode().equals(wxOrder.getOrderStatus())){ || EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode().equals(wxOrder.getOrderStatus())){
WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), orderId);
WxRefundOrder refundOrder = wxRefundOrderService.findRefundStatus(getTenantInfo(), orderId);
map.put("outRefundOrderId",refundOrder.getId()); map.put("outRefundOrderId",refundOrder.getId());
map.put("refundOrderStatus",refundOrder.getRefundOrderStatus()); map.put("refundOrderStatus",refundOrder.getRefundOrderStatus());
} }


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

@@ -4,8 +4,11 @@ import java.util.*;
import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxRefundOrder; import com.iformall.domain.po.WxRefundOrder;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import org.apache.ibatis.annotations.Param;


public interface WxRefundOrderMapper extends CommonMapper<WxRefundOrder, Long> { public interface WxRefundOrderMapper extends CommonMapper<WxRefundOrder, Long> {


List<WxRefundOrder> findList(WxRefundOrder wxRefundOrder); List<WxRefundOrder> findList(WxRefundOrder wxRefundOrder);

WxRefundOrder findRefundStatus(@Param("orderId")Long orderId, @Param("tenantId")String tenantId);
} }

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

@@ -103,6 +103,8 @@ public interface WxRefundOrderService {


WxRefundOrder findRefundOrder(TenantEntity tenantInfo, Long orderId); WxRefundOrder findRefundOrder(TenantEntity tenantInfo, Long orderId);


WxRefundOrder findRefundStatus(TenantEntity tenantInfo, Long orderId);

/** /**
* 抖音2.0 退款回调创建退款订单 * 抖音2.0 退款回调创建退款订单
* @param tenantEntity * @param tenantEntity


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

@@ -869,6 +869,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
return null; return null;
} }


@Override
public WxRefundOrder findRefundStatus(TenantEntity tenantInfo, Long orderId) {
return wxRefundOrderMapper.findRefundStatus(orderId,tenantInfo.getTenantId());
}

@Override @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback) { public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback) {


+ 7
- 0
mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml Прегледај датотеку

@@ -132,5 +132,12 @@
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>


<select id="findRefundStatus" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select `id`,`tenant_id`,`parent_tenant_id`,`refund_order_status`
from wx_refund_order
where `order_id` = #{orderId} and `tenant_id` = #{tenantId}
order by `create_time` desc
limit 1
</select>


</mapper> </mapper>

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