订单查询

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -27,6 +27,8 @@ import com.gic.business.order.qdto.ordermanage.OrderShipmentQDTO;
 import com.gic.business.order.qdto.ordermanage.QueryOrderDetailQDTO;
 import com.gic.business.order.qdto.ordermanage.UpdateOrderLogisticsQDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -46,6 +48,8 @@ public class GicOrderController {
 
     @Autowired
     private WebOrderManageApiService webOrderManageApiService;
+    @Autowired
+    private ClerkService clerkService;
 
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
@@ -60,7 +64,9 @@ public class GicOrderController {
         qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderStep(strStatus);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
-        qdto.setSearchOrderParam(search);
+        if (StringUtils.isNotEmpty(search)) {
+            qdto.setSearchOrderParam(search);
+        }
         // 配送方式 -1：所有 0：门店自提 1：快递发货
         qdto.setDeliveryType(1);
         return this.orderListSelect(qdto, pageInfo);
@@ -101,6 +107,15 @@ public class GicOrderController {
                 }
             }
             Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
+            voList.forEach(item -> {
+                String clerkId = item.getBelongClerkId();
+                if (StringUtils.isNotEmpty(clerkId)) {
+                    ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId);
+                    if (null != clerkDTO) {
+                        item.setBelongClerkName(clerkDTO.getClerkName());
+                    }
+                }
+            });
             retPage.setResult(voList);
             return RestResponse.successResult(retPage);
         }
@@ -142,6 +157,9 @@ public class GicOrderController {
         member.setAddressPhone(orderInfo.getBuyerPhone());
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getAddressInfo());
+        
+        
+        
         orderDetailVO.setMember(member);
         return RestResponse.successResult(orderDetailVO);
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundDetailVO.java

@@ -67,6 +67,54 @@ public class OrderRefundDetailVO implements Serializable {
 
     // 优惠信息
     private String discountAmountInfo;
+    
+    // 退款凭证图片,号隔开
+    private String refundImgUrl ;
+    
+    private String sellerAddressInfo ;
+    private String sellerName ;
+    private String sellerPhone ;
+    private String refundFailReason ;
+    
+    public String getSellerAddressInfo() {
+        return sellerAddressInfo;
+    }
+
+    public String getSellerName() {
+        return sellerName;
+    }
+
+    public String getSellerPhone() {
+        return sellerPhone;
+    }
+
+    public String getRefundFailReason() {
+        return refundFailReason;
+    }
+
+    public void setSellerAddressInfo(String sellerAddressInfo) {
+        this.sellerAddressInfo = sellerAddressInfo;
+    }
+
+    public void setSellerName(String sellerName) {
+        this.sellerName = sellerName;
+    }
+
+    public void setSellerPhone(String sellerPhone) {
+        this.sellerPhone = sellerPhone;
+    }
+
+    public void setRefundFailReason(String refundFailReason) {
+        this.refundFailReason = refundFailReason;
+    }
+
+    public String getRefundImgUrl() {
+        return refundImgUrl;
+    }
+
+    public void setRefundImgUrl(String refundImgUrl) {
+        this.refundImgUrl = refundImgUrl;
+    }
 
     public String getMallProId() {
         return mallProId;