Browse Source

fix:退款状态查询

liujunchi 3 years ago
parent
commit
2e602a168a

+ 4 - 4
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OmsReturnApplyQueryParam.java

@@ -13,8 +13,8 @@ public class OmsReturnApplyQueryParam {
     private Long id;
     private Long id;
     @ApiModelProperty(value = "收货人姓名/号码")
     @ApiModelProperty(value = "收货人姓名/号码")
     private String receiverKeyword;
     private String receiverKeyword;
-    @ApiModelProperty(value = "申请状态:0->待处理;1->退货中;2->已完成;3->已拒绝")
-    private Integer status;
+    @ApiModelProperty(value = "申请状态:0->待处理;1->退货中;2->已完成;3->已拒绝 多个逗号隔开")
+    private String status;
     @ApiModelProperty(value = "申请时间")
     @ApiModelProperty(value = "申请时间")
     private String createTime;
     private String createTime;
     @ApiModelProperty(value = "处理人员")
     @ApiModelProperty(value = "处理人员")
@@ -61,11 +61,11 @@ public class OmsReturnApplyQueryParam {
         this.receiverKeyword = receiverKeyword;
         this.receiverKeyword = receiverKeyword;
     }
     }
 
 
-    public Integer getStatus() {
+    public String getStatus() {
         return status;
         return status;
     }
     }
 
 
-    public void setStatus(Integer status) {
+    public void setStatus(String status) {
         this.status = status;
         this.status = status;
     }
     }
 
 

+ 2 - 5
cooleshow-mall/mall-portal/src/main/resources/config/mybatis/OmsOrderReturnApplyDao.xml

@@ -22,11 +22,8 @@
         <if test="queryParam.id!=null">
         <if test="queryParam.id!=null">
             AND oora.id = #{queryParam.id}
             AND oora.id = #{queryParam.id}
         </if>
         </if>
-        <if test="queryParam.status!=null">
-            AND oora.status = #{queryParam.status}
-        </if>
-        <if test="queryParam.status!=null">
-            AND oora.status = #{queryParam.status}
+        <if test="queryParam.status != null and queryParam.status != ''">
+            AND find_in_set( oora.status , #{queryParam.status})
         </if>
         </if>
         <if test="queryParam.handleMan!=null and queryParam.handleMan!=''">
         <if test="queryParam.handleMan!=null and queryParam.handleMan!=''">
             AND oora.handle_man = #{queryParam.handleMan}
             AND oora.handle_man = #{queryParam.handleMan}