status

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -25,7 +26,8 @@ public class RefundSearchParam implements Serializable {
 
     private String orderCode;
 
-    private Integer status;
+    private String status;
+    private List<String> statusStr;
 
     @ApiModelProperty(value = "页数", example = "0")
     @NotNull(message = "页数不能为空")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -21,16 +21,35 @@
                         <li>
                             <label>退款状态：</label>
                             <select name="status">
-                                <option value="">全部</option>
-                                <option value="888">请求退款</option>
-                                <option value="2">取消退款</option>
-                                <option value="1">一审审核通过</option>
-                                <option value="5">一审驳回退款</option>
-                                <option value="7">二审通过等待退款</option>
-                                <option value="8">二审驳回退款</option>
-                                <option value="3">正在退款</option>
-                                <option value="4">完成退款</option>
-                                <option value="6">退款失败</option>
+
+                                <shiro:hasRole name="admin">
+                                    <option value="">全部</option>
+                                </shiro:hasRole>
+                                <shiro:hasPermission name="kylin:refund:apply">
+                                    <shiro:lacksRole name="admin">
+                                        <option value="888,2,5,7,3,4,6">全部</option>
+                                    </shiro:lacksRole>
+                                    <option value="888">请求退款</option>
+                                    <option value="2">取消退款</option>
+                                    <option value="5">一审驳回退款</option>
+                                    <option value="7">二审通过等待退款</option>
+                                    <option value="3">正在退款</option>
+                                    <option value="4">完成退款</option>
+                                    <option value="6">退款失败</option>
+                                </shiro:hasPermission>
+                                <shiro:hasPermission name="kylin:refund:review">
+                                    <shiro:lacksRole name="admin">
+                                        <option value="888,8">全部</option>
+                                    </shiro:lacksRole>
+                                    <option value="888">请求退款</option>
+                                    <option value="8">二审驳回退款</option>
+                                </shiro:hasPermission>
+                                <shiro:hasPermission name="kylin:refund:execute">
+                                    <shiro:lacksRole name="admin">
+                                        <option value="1">全部</option>
+                                    </shiro:lacksRole>
+                                    <option value="1">一审审核通过</option>
+                                </shiro:hasPermission>
                             </select>
                         </li>
                         <li>
@@ -122,7 +141,7 @@
         var shortCode = document.getElementsByName("findCode")[0].value;
         var allCode = document.getElementsByName("allCode")[0];
         $.operate.get(prefix + "/search/code?code=" + shortCode + "&type=2", function (res) {
-            allCode.value=res.msg;
+            allCode.value = res.msg;
         });
     }
 
@@ -257,8 +276,8 @@
                             return '';
                         }
                     },
-                    cellStyle: function(value, row, index) {
-                        return {css : {"color": "red","font-weight": "bold"} };
+                    cellStyle: function (value, row, index) {
+                        return {css: {"color": "red", "font-weight": "bold"}};
                     }
                 },
                 {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -402,6 +403,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         PageInfo<OrderRefundDao> pageInfoTmp = null;
         try {
             PageHelper.startPage(refundSearchParam.getPageNum(), refundSearchParam.getPageSize());
+            if (!refundSearchParam.getStatus().isEmpty()) {
+                refundSearchParam.setStatusStr(Arrays.asList(refundSearchParam.getStatus().split(",")));
+            }
             List<OrderRefundDao> voList = kylinOrderRefundsMapper.misRefundList(BeanUtil.convertBeanToMap(refundSearchParam));
             for (OrderRefundDao item : voList) {
                 item.setStatusName(item.getStatus());