|
@@ -1,11 +1,8 @@
|
|
package com.caimei.controller.search;
|
|
package com.caimei.controller.search;
|
|
|
|
|
|
import com.caimei.controller.user.LoginController;
|
|
import com.caimei.controller.user.LoginController;
|
|
-import com.caimei.entity.CmMallPage;
|
|
|
|
-import com.caimei.entity.CmWxJsonModel;
|
|
|
|
-import com.caimei.entity.CmMallOrganizeProducts;
|
|
|
|
-import com.caimei.entity.CmMallProductLadderPrice;
|
|
|
|
-import com.caimei.entity.CmMallProductSearchHistory;
|
|
|
|
|
|
+import com.caimei.entity.*;
|
|
|
|
+import com.caimei.mapper.order.OrderMapper;
|
|
import com.caimei.service.search.SearchService;
|
|
import com.caimei.service.search.SearchService;
|
|
import com.caimei.utils.AppUtils;
|
|
import com.caimei.utils.AppUtils;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
@@ -28,6 +25,8 @@ public class SearchController {
|
|
private SearchService searchService;
|
|
private SearchService searchService;
|
|
@Autowired
|
|
@Autowired
|
|
private LoginController loginController;
|
|
private LoginController loginController;
|
|
|
|
+ @Autowired
|
|
|
|
+ private OrderMapper orderMapper;
|
|
@Value("${miniprogram.domain}")
|
|
@Value("${miniprogram.domain}")
|
|
private String domain;
|
|
private String domain;
|
|
|
|
|
|
@@ -93,4 +92,81 @@ public class SearchController {
|
|
}
|
|
}
|
|
return model.success();
|
|
return model.success();
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 订单列表搜索订单
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping("/order")
|
|
|
|
+ public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
|
|
|
|
+ Integer pageSize, Integer userID, HttpServletRequest request) {
|
|
|
|
+ CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
|
|
+ String openID = (String) jsonModel.getData();
|
|
|
|
+ //查询历史记录是否存在
|
|
|
|
+ CmMallProductSearchHistory orderSearchHistory = searchService.findAllOrderRecord(organizeID, searchWord, openID);
|
|
|
|
+ if (orderSearchHistory == null) {
|
|
|
|
+ //保存并删除大于10条的历史记录
|
|
|
|
+ searchService.saveOrderRecord(organizeID, searchWord, openID);
|
|
|
|
+ searchService.deleteOrderRecord(organizeID, openID);
|
|
|
|
+ } else {
|
|
|
|
+ searchService.updateOrderRecord(organizeID, searchWord, openID);
|
|
|
|
+ }
|
|
|
|
+ if (index == null) index = 0;
|
|
|
|
+ if (pageSize == null) pageSize = 10;
|
|
|
|
+ PageHelper.startPage(index, pageSize);
|
|
|
|
+ List<CmMallOrder> orderList = searchService.searchOrder(organizeID, searchWord, userID);
|
|
|
|
+ for (CmMallOrder order : orderList) {
|
|
|
|
+ //111,待付待收待发
|
|
|
|
+ if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
|
|
|
|
+ order.setStatus(111);
|
|
|
|
+ }
|
|
|
|
+ String[] ShopOrderIDs = {};
|
|
|
|
+ if (order.getShopOrderIDs().contains(",")) {
|
|
|
|
+ ShopOrderIDs = order.getShopOrderIDs().split(",");
|
|
|
|
+ } else {
|
|
|
|
+ ShopOrderIDs = new String[]{order.getShopOrderIDs()};
|
|
|
|
+ }
|
|
|
|
+ List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
|
|
|
|
+ for (CmMallShopOrder shopOrder : shopOrderList) {
|
|
|
|
+ List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
|
|
|
|
+ for (CmMallOrderProduct orderProduct : orderProductList) {
|
|
|
|
+ orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
|
|
|
|
+ }
|
|
|
|
+ shopOrder.setCmOrderProducts(orderProductList);
|
|
|
|
+ shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
|
|
|
|
+ }
|
|
|
|
+ order.setShopOrderList(shopOrderList);
|
|
|
|
+ }
|
|
|
|
+ CmMallPage<CmMallOrder> orderPage = new CmMallPage<>(orderList);
|
|
|
|
+ return CmWxJsonModel.newInstance().success(orderPage);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 订单搜索历史记录
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping("/history")
|
|
|
|
+ public CmWxJsonModel orderRecord(Integer organizeID, String code, HttpServletRequest request) {
|
|
|
|
+ CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
|
|
+ String openID = (String) jsonModel.getData();
|
|
|
|
+ List<CmMallProductSearchHistory> historyList = searchService.findOrderRecord(organizeID, openID);
|
|
|
|
+ return CmWxJsonModel.newInstance().success(historyList);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 订单搜索删除历史记录
|
|
|
|
+ */
|
|
|
|
+ @ResponseBody
|
|
|
|
+ @RequestMapping("/deleteOrderRecord")
|
|
|
|
+ public CmWxJsonModel deleteOrderRecord(Integer organizeID, String code, HttpServletRequest request) {
|
|
|
|
+ CmWxJsonModel model = CmWxJsonModel.newInstance();
|
|
|
|
+ try {
|
|
|
|
+ CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
|
|
+ String openID = (String) jsonModel.getData();
|
|
|
|
+ searchService.deleteSearchHistory(organizeID, openID);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ return model.error("删除失败");
|
|
|
|
+ }
|
|
|
|
+ return model.success();
|
|
|
|
+ }
|
|
}
|
|
}
|