|
|
|
@ -130,7 +130,7 @@ public class HighOrderController { |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
|
if (userInfoModel.getSecRole().getRoleType() == 5) { |
|
|
|
|
map.put("companyId" , userInfoModel.getBsCompany().getId()); |
|
|
|
|
map.put("companyId" , userInfoModel.getBsCompany().getId()); |
|
|
|
|
} |
|
|
|
|
if (userInfoModel.getSecRole().getRoleType() == 2) { |
|
|
|
|
map.put("merchantId" , userInfoModel.getMerchant().getId()); |
|
|
|
@ -241,7 +241,12 @@ public class HighOrderController { |
|
|
|
|
map.put("merchantId", merchantId); |
|
|
|
|
|
|
|
|
|
} else if (userInfoModel.getSecUser().getObjectType() == 1) { |
|
|
|
|
map.put("companyId", userInfoModel.getBsCompany().getId()); |
|
|
|
|
if (userInfoModel.getBsCompany().getId() == 3) { |
|
|
|
|
map.put("companyId", 23); |
|
|
|
|
} else { |
|
|
|
|
map.put("companyId", userInfoModel.getBsCompany().getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
map.put("merchantId", merchantId); |
|
|
|
|
|
|
|
|
|
} else if (userInfoModel.getSecUser().getObjectType() == 2) { |
|
|
|
@ -275,19 +280,19 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "查询加油订单列表") |
|
|
|
|
public ResponseData getGasOrderList(@RequestParam(name = "companyId", required = false) Long companyId, |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
SessionObject sessionObject = userCenter.getSessionObject(request); |
|
|
|
@ -383,19 +388,19 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "查询电影订单列表") |
|
|
|
|
public ResponseData getCinemaOrderList(@RequestParam(name = "companyId", required = false) Long companyId, |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
SessionObject sessionObject = userCenter.getSessionObject(request); |
|
|
|
@ -437,21 +442,21 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "根据表示查询订单") |
|
|
|
|
public ResponseData getOrderListByIdCode(@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "memPhone", required = false) String memPhone, |
|
|
|
|
@RequestParam(name = "memDiscountName", required = false) String memDiscountName, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "memPhone", required = false) String memPhone, |
|
|
|
|
@RequestParam(name = "memDiscountName", required = false) String memDiscountName, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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 = "pageNum", required = true) Integer pageNum, |
|
|
|
|
@RequestParam(name = "pageSize", required = true) Integer pageSize, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
SessionObject sessionObject = userCenter.getSessionObject(request); |
|
|
|
@ -484,20 +489,20 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "导出商品订单列表") |
|
|
|
|
public ResponseData exportOrderListByIdCode(@RequestParam(name = "companyId", required = false) Long companyId, |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "memPhone", required = false) String memPhone, |
|
|
|
|
@RequestParam(name = "memDiscountName", required = false) String memDiscountName, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
@RequestParam(name = "merchantId", required = false) Long merchantId, |
|
|
|
|
@RequestParam(name = "identificationCode", required = true) String identificationCode, |
|
|
|
|
@RequestParam(name = "orderNo", required = false) String orderNo, |
|
|
|
|
@RequestParam(name = "memPhone", required = false) String memPhone, |
|
|
|
|
@RequestParam(name = "memDiscountName", required = false) String memDiscountName, |
|
|
|
|
@RequestParam(name = "paySerialNo", required = false) String paySerialNo, |
|
|
|
|
@RequestParam(name = "payModel", required = false) Integer payModel, |
|
|
|
|
@RequestParam(name = "payType", required = false) Integer payType, |
|
|
|
|
@RequestParam(name = "orderStatus", required = false) Integer orderStatus, |
|
|
|
|
@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, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
try { |
|
|
|
|
SessionObject sessionObject = userCenter.getSessionObject(request); |
|
|
|
|
UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject(); |
|
|
|
@ -585,7 +590,7 @@ public class HighOrderController { |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "汇联通订单退款") |
|
|
|
|
public ResponseData orderToRefundHlt(@RequestParam(name = "orderId", required = false) Long orderId, |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
HttpServletRequest request) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
HighOrder order = highOrderService.getOrderById(orderId); |
|
|
|
@ -601,21 +606,21 @@ public class HighOrderController { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject jsonObject = HuiLianTongUnionCardConfig.refund( "HFR"+new Date().getTime() , order.getOrderNo()); |
|
|
|
|
JSONObject dataObject = HuiLianTongUnionCardConfig.resolveResponse(jsonObject.getString("data")); |
|
|
|
|
|
|
|
|
|
if (dataObject.getBoolean("success")) { |
|
|
|
|
order.setOrderStatus(4); |
|
|
|
|
order.setRefundTime(new Date()); |
|
|
|
|
order.setRefundContent(dataObject.getString("orderId")); |
|
|
|
|
order.setRefusalRefundContent("HFR"+new Date().getTime() ); |
|
|
|
|
order.setRefundPrice(order.getPayRealPrice()); |
|
|
|
|
highOrderService.updateOrder(order); |
|
|
|
|
return ResponseMsgUtil.success("退款成功"); |
|
|
|
|
} else { |
|
|
|
|
log.error("orderToPay error!", dataObject.getString("message")); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, dataObject.getString("message")); |
|
|
|
|
} |
|
|
|
|
JSONObject jsonObject = HuiLianTongUnionCardConfig.refund( "HFR"+new Date().getTime() , order.getOrderNo()); |
|
|
|
|
JSONObject dataObject = HuiLianTongUnionCardConfig.resolveResponse(jsonObject.getString("data")); |
|
|
|
|
|
|
|
|
|
if (dataObject.getBoolean("success")) { |
|
|
|
|
order.setOrderStatus(4); |
|
|
|
|
order.setRefundTime(new Date()); |
|
|
|
|
order.setRefundContent(dataObject.getString("orderId")); |
|
|
|
|
order.setRefusalRefundContent("HFR"+new Date().getTime() ); |
|
|
|
|
order.setRefundPrice(order.getPayRealPrice()); |
|
|
|
|
highOrderService.updateOrder(order); |
|
|
|
|
return ResponseMsgUtil.success("退款成功"); |
|
|
|
|
} else { |
|
|
|
|
log.error("orderToPay error!", dataObject.getString("message")); |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, dataObject.getString("message")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("HighOrderController --> getUserOrderList() error!", e); |
|
|
|
|