| @@ -564,6 +564,11 @@ public class WxOrderController extends BaseController { | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| return new ResultData(Result.ERROR,e.getMessage()); | 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.setCUserId(memberId); | ||||
| wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | ||||
| wxOrder.updateTenantInfo(getTenantInfo()); | wxOrder.updateTenantInfo(getTenantInfo()); | ||||
| @@ -1,5 +1,8 @@ | |||||
| package com.iformall.enums; | package com.iformall.enums; | ||||
| import java.util.ArrayList; | |||||
| import java.util.List; | |||||
| /** | /** | ||||
| * Created by Stormeye on 2018/08/09. | * Created by Stormeye on 2018/08/09. | ||||
| */ | */ | ||||
| @@ -52,4 +55,12 @@ public enum EnumOrderStatus { | |||||
| public String getMessage() { | public String getMessage() { | ||||
| return message; | return message; | ||||
| } | } | ||||
| public static List<Integer> getRefundStatus(){ | |||||
| List<Integer> 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; | |||||
| } | |||||
| } | } | ||||
| @@ -1126,9 +1126,15 @@ | |||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test="orderStatus != null"> | |||||
| <if test="null != orderStatus"> | |||||
| AND order_status = #{orderStatus} | AND order_status = #{orderStatus} | ||||
| </if> | </if> | ||||
| <if test=" null != statusS "> | |||||
| and `order_status` in | |||||
| <foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")"> | |||||
| #{sItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != payVendor "> | <if test=" null != payVendor "> | ||||
| and pay_vendor = #{payVendor} | and pay_vendor = #{payVendor} | ||||
| </if> | </if> | ||||