Merge branch 'order' of http://139.159.177.244:3000/hurui/hai-server into order
commit
f61433f761
@ -0,0 +1,121 @@ |
|||||||
|
package com.web.controller.business; |
||||||
|
|
||||||
|
import com.github.pagehelper.PageHelper; |
||||||
|
import com.github.pagehelper.PageInfo; |
||||||
|
import com.hai.common.exception.ErrorCode; |
||||||
|
import com.hai.common.exception.ErrorHelp; |
||||||
|
import com.hai.common.exception.SysCode; |
||||||
|
import com.hai.common.security.UserCenter; |
||||||
|
import com.hai.common.utils.ResponseMsgUtil; |
||||||
|
import com.hai.enum_type.UserObjectTypeEnum; |
||||||
|
import com.hai.model.ResponseData; |
||||||
|
import com.hai.model.UserInfoModel; |
||||||
|
import com.hai.order.service.OrderService; |
||||||
|
import io.swagger.annotations.Api; |
||||||
|
import io.swagger.annotations.ApiOperation; |
||||||
|
import org.slf4j.Logger; |
||||||
|
import org.slf4j.LoggerFactory; |
||||||
|
import org.springframework.stereotype.Controller; |
||||||
|
import org.springframework.web.bind.annotation.RequestMapping; |
||||||
|
import org.springframework.web.bind.annotation.RequestMethod; |
||||||
|
import org.springframework.web.bind.annotation.RequestParam; |
||||||
|
import org.springframework.web.bind.annotation.ResponseBody; |
||||||
|
|
||||||
|
import javax.annotation.Resource; |
||||||
|
import javax.servlet.http.HttpServletRequest; |
||||||
|
import java.text.SimpleDateFormat; |
||||||
|
import java.util.HashMap; |
||||||
|
import java.util.Map; |
||||||
|
|
||||||
|
@Controller |
||||||
|
@RequestMapping(value = "thirdParty") |
||||||
|
@Api(value = "第三方订单业务") |
||||||
|
public class OrderThirdPartyController { |
||||||
|
|
||||||
|
private static Logger log = LoggerFactory.getLogger(OrderOilController.class); |
||||||
|
|
||||||
|
@Resource |
||||||
|
private UserCenter userCenter; |
||||||
|
|
||||||
|
@Resource |
||||||
|
private OrderService orderService; |
||||||
|
|
||||||
|
|
||||||
|
@RequestMapping(value = "/getOrderList", method = RequestMethod.GET) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "查询第三方订单列表") |
||||||
|
public ResponseData getOrderList(@RequestParam(name = "orderNo", required = false) String orderNo, |
||||||
|
@RequestParam(name = "memPhone", required = false) String memPhone, |
||||||
|
@RequestParam(name = "memCardNo", required = false) String memCardNo, |
||||||
|
@RequestParam(name = "payType", required = false) Integer payType, |
||||||
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
||||||
|
@RequestParam(name = "companyId", required = false) Long companyId, |
||||||
|
@RequestParam(name = "createTimeS", required = false) Long createTimeS, |
||||||
|
@RequestParam(name = "createTimeE", required = false) Long createTimeE, |
||||||
|
@RequestParam(name = "payTimeS", required = false) Long payTimeS, |
||||||
|
@RequestParam(name = "payTimeE", required = false) Long payTimeE, |
||||||
|
@RequestParam(name = "productType", required = false) Integer productType, |
||||||
|
@RequestParam(name = "finishTimeS", required = false) Long finishTimeS, |
||||||
|
@RequestParam(name = "finishTimeE", required = false) Long finishTimeE, |
||||||
|
@RequestParam(name = "pageNum", required = true) Integer pageNum, |
||||||
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
||||||
|
HttpServletRequest request) { |
||||||
|
try { |
||||||
|
|
||||||
|
UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class); |
||||||
|
if (userInfoModel == null) { |
||||||
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); |
||||||
|
} |
||||||
|
Map<String,Object> map = new HashMap<>(); |
||||||
|
if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) { |
||||||
|
map.put("companyId" , companyId); |
||||||
|
} else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) { |
||||||
|
map.put("companyId", userInfoModel.getBsCompany().getId()); |
||||||
|
} else { |
||||||
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, ""); |
||||||
|
} |
||||||
|
if (createTimeS != null && createTimeE != null) { |
||||||
|
map.put("createTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTimeS)); |
||||||
|
map.put("createTimeE", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTimeE)); |
||||||
|
} |
||||||
|
if (createTimeS != null && createTimeE != null) { |
||||||
|
map.put("payTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payTimeS)); |
||||||
|
map.put("payTimeE", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payTimeE)); |
||||||
|
} |
||||||
|
if (createTimeS != null && createTimeE != null) { |
||||||
|
map.put("finishTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(finishTimeS)); |
||||||
|
map.put("finishTimeE", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(finishTimeE)); |
||||||
|
} |
||||||
|
map.put("orderNo", orderNo); |
||||||
|
map.put("memPhone", memPhone); |
||||||
|
map.put("memCardNo", memCardNo); |
||||||
|
map.put("productType", productType); |
||||||
|
map.put("orderStatus", orderStatus); |
||||||
|
map.put("payType", payType); |
||||||
|
|
||||||
|
PageHelper.startPage(pageNum,pageSize); |
||||||
|
return ResponseMsgUtil.success(new PageInfo<>(orderService.getOrderList(map))); |
||||||
|
|
||||||
|
} catch (Exception e) { |
||||||
|
log.error("OrderCouponController --> getOrderList() error!", e); |
||||||
|
return ResponseMsgUtil.exception(e); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
@RequestMapping(value="/getOrderDetail",method = RequestMethod.GET) |
||||||
|
@ResponseBody |
||||||
|
@ApiOperation(value = "查询订单详情") |
||||||
|
public ResponseData getOrderDetail(@RequestParam(name = "orderNo", required = true) String orderNo) { |
||||||
|
try { |
||||||
|
Map<String, Object> map = new HashMap<>(); |
||||||
|
map.put("tradeOrder", orderService.getOrderDetailByNo(orderNo)); |
||||||
|
|
||||||
|
return ResponseMsgUtil.success(map); |
||||||
|
|
||||||
|
} catch (Exception e) { |
||||||
|
log.error("OrderIntegralRechargeController -> getOrderDetail() error!",e); |
||||||
|
return ResponseMsgUtil.exception(e); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue