diff --git a/src/main/java/com/hxtec/polaris/controller/OrderManagerController.java b/src/main/java/com/hxtec/polaris/controller/OrderManagerController.java new file mode 100644 index 0000000000000000000000000000000000000000..958e94c55ed8f8d04f09df73b02bf991ef08abf2 --- /dev/null +++ b/src/main/java/com/hxtec/polaris/controller/OrderManagerController.java @@ -0,0 +1,30 @@ +package com.hxtec.polaris.controller; + +import com.hxtec.polaris.service.OrderManagerService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Describtion OMS 相关 + * @Author yonyong + * @Date 2019/12/23 14:29 + * @Version 1.0.0 + **/ +@RestController +@RequestMapping(value = "orderMng") +@CrossOrigin +@Api(value = "/orderMng", tags = "订单相关") +public class OrderManagerController { + + @Autowired + OrderManagerService orderManagerService; + + @GetMapping("list") + public Object list(int pageNum,int pageSize,String orderSn,String receiverKeyword,String status,String createTime){ + return orderManagerService.list(pageNum,pageSize,orderSn,receiverKeyword,status,createTime); + } +} diff --git a/src/main/java/com/hxtec/polaris/controller/ProductManageController.java b/src/main/java/com/hxtec/polaris/controller/ProductManageController.java index 49d806aa6e315bf7fa2b2219e6f246ae3d335cff..7dc1940ae5a90bc47246df37631d987e98d3e555 100644 --- a/src/main/java/com/hxtec/polaris/controller/ProductManageController.java +++ b/src/main/java/com/hxtec/polaris/controller/ProductManageController.java @@ -24,9 +24,9 @@ import java.util.Map; * @author Caps.Xia */ @RestController -@RequestMapping("product") +@RequestMapping("productm") @CrossOrigin -@Api(value = "/product", tags = "商品详情") +@Api(value = "/productm", tags = "商品详情") public class ProductManageController { private final ProductService skuService; diff --git a/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java b/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java index 3f7665ea3c35fe9d672dc64b894b7fcad26d8b9d..46e2ff3a367bd17db2b2c9a6aa4710171b61ced6 100644 --- a/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java +++ b/src/main/java/com/hxtec/polaris/mapper/ShopOrderMapper.java @@ -88,4 +88,31 @@ public interface ShopOrderMapper extends MyMapper { * @return */ Integer doAutoCloseOrder(@Param("date") Date date); + + /** + * OMS MANAGER START >>>>>>>>>> + */ + + /** + * 后台管理员获取订单数据 count + * @param orderSn + * @param receiverKeyword + * @param status + * @param createTime + * @return + */ + int getOrderCountMng(@Param("orderSn")String orderSn, @Param("receiverKeyword")String receiverKeyword, @Param("status")String status, @Param("time")String createTime); + + /** + * 后台管理员获取订单数据 + * @param start + * @param pageSize + * @param orderSn + * @param receiverKeyword + * @param status + * @param createTime + * @return + */ + List> getOrderMng(@Param("start") int start, @Param("rows")int pageSize, @Param("orderSn")String orderSn, + @Param("receiverKeyword")String receiverKeyword, @Param("status")String status, @Param("time")String createTime); } \ No newline at end of file diff --git a/src/main/java/com/hxtec/polaris/service/OrderManagerService.java b/src/main/java/com/hxtec/polaris/service/OrderManagerService.java new file mode 100644 index 0000000000000000000000000000000000000000..08c4717917ab8c153484ef9c708d139d34edf604 --- /dev/null +++ b/src/main/java/com/hxtec/polaris/service/OrderManagerService.java @@ -0,0 +1,15 @@ +package com.hxtec.polaris.service; + +public interface OrderManagerService { + /** + * 获取订单信息 + * @param pageNum + * @param pageSize + * @param orderSn + * @param receiverKeyword + * @param status + * @param createTime + * @return + */ + Object list(int pageNum, int pageSize, String orderSn, String receiverKeyword, String status, String createTime); +} diff --git a/src/main/java/com/hxtec/polaris/service/impl/OrderManagerServiceImpl.java b/src/main/java/com/hxtec/polaris/service/impl/OrderManagerServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..98126bac827fe8b19cbb506fb83100345cc8a6e9 --- /dev/null +++ b/src/main/java/com/hxtec/polaris/service/impl/OrderManagerServiceImpl.java @@ -0,0 +1,64 @@ +package com.hxtec.polaris.service.impl; + +import com.hxtec.polaris.commons.api.vo.Result; +import com.hxtec.polaris.commons.constant.Code; +import com.hxtec.polaris.commons.constant.Log; +import com.hxtec.polaris.commons.constant.Msg; +import com.hxtec.polaris.commons.dto.Page; +import com.hxtec.polaris.commons.exception.MyException; +import com.hxtec.polaris.mapper.ShopOrderMapper; +import com.hxtec.polaris.service.OrderManagerService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.text.MessageFormat; +import java.util.List; +import java.util.Map; + +/** + * @Describtion OMS 相关 + * @Author yonyong + * @Date 2019/12/23 14:39 + * @Version 1.0.0 + **/ +@Service +@Transactional +public class OrderManagerServiceImpl implements OrderManagerService { + + @Resource + ShopOrderMapper shopOrderMapper; + + @Override + public Object list(int pageNum, int pageSize, String orderSn, String receiverKeyword, String status, String createTime) { + try { + return doList(pageNum,pageSize,orderSn,receiverKeyword,status,createTime); + }catch (Exception e){ + String params = "pageNum="+pageNum + ";pageSize=" + pageSize + ";orderSn=" + orderSn + ";receiverKeyword=" + receiverKeyword + + ";status=" + status + ";createTime=" + createTime; + String LOG_MSG = MessageFormat.format(Log.PATTERN_LOG,Log.INSERT,"OrderManagerServiceImpl","list",params); + throw new MyException(Result.error(Code.FAIL_4501, Msg.COMMON_FAIL),LOG_MSG); + } + } + + /** + * 执行初始化获取订单信息 + * @param pageNum + * @param pageSize + * @param orderSn + * @param receiverKeyword + * @param status + * @param createTime + * @return + */ + private Result doList(int pageNum, int pageSize, String orderSn, String receiverKeyword, String status, String createTime) { + //分页信息 + int count = shopOrderMapper.getOrderCountMng(orderSn,receiverKeyword,status,createTime); + Page page = new Page(count,pageNum,pageSize); + + //数据信息 + //分页查出订单信息 + List> list = shopOrderMapper.getOrderMng((pageNum-1)*pageSize,pageSize,orderSn,receiverKeyword,status,createTime); + return Result.ok(page,list); + } +} diff --git a/src/main/resources/mapper/ShopOrderMapper.xml b/src/main/resources/mapper/ShopOrderMapper.xml index 6ddd1a2412b89b1e246c3162d3fafb56d736cf5a..3afae20a957192eba36a7922e546c686137a6204 100644 --- a/src/main/resources/mapper/ShopOrderMapper.xml +++ b/src/main/resources/mapper/ShopOrderMapper.xml @@ -106,4 +106,41 @@ from shop_order WHERE member_id=#{uid} and id=#{oid} and (isnull(is_delete) or is_delete!='Y') + + + \ No newline at end of file