From 3f7b28f530081d39e7f7aa26ade1b3cf5db33ec5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 26 Apr 2022 19:06:22 +0800 Subject: [PATCH] //update refun --- .../com/iformall/controller/WxOrderController.java | 5 +++++ .../main/java/com/iformall/enums/EnumOrderStatus.java | 11 +++++++++++ .../src/main/resources/mapper/WxOrderMapper.xml | 8 +++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 611ad0d29..536faa4ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -564,6 +564,11 @@ public class WxOrderController extends BaseController { } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); } + if(wxOrder.getOrderStatus() != null && EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus())){ + wxOrder.setOrderStatus(null); + wxOrder.setStatusS(EnumOrderStatus.getRefundStatus()); + } + wxOrder.setCUserId(memberId); wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); wxOrder.updateTenantInfo(getTenantInfo()); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java index 7756a08a2..77346978b 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.ArrayList; +import java.util.List; + /** * Created by Stormeye on 2018/08/09. */ @@ -52,4 +55,12 @@ public enum EnumOrderStatus { public String getMessage() { return message; } + + public static List getRefundStatus(){ + List list = new ArrayList<>(); + list.add(ORDER_STATUS_PENDING_REFUND.getCode()); + list.add(ORDER_STATUS_REFUND_SUCCESS.getCode()); + list.add(ORDER_STATUS_REFUND_FAILD.getCode()); + return list; + } } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 52f0f01a7..d1cf81f38 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -1126,9 +1126,15 @@ and `parent_tenant_id` = #{parentTenantId} - + AND order_status = #{orderStatus} + + and `order_status` in + + #{sItem} + + and pay_vendor = #{payVendor}