Commit 3e0212b2 by jinxin

微信退款接口

parent 3030bdff
...@@ -58,7 +58,11 @@ public class LicenceOrderController { ...@@ -58,7 +58,11 @@ public class LicenceOrderController {
* 查询订单详情 * 查询订单详情
*/ */
@RequestMapping("licence-order-detail") @RequestMapping("licence-order-detail")
public RestResponse<LicenceOrderVO> getLicenceOrderDetail(@RequestParam Long orderId) { public RestResponse<LicenceOrderVO> getLicenceOrderDetail(@RequestParam Long orderId, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
ServiceResponse<LicenceOrderDTO> licenceOrderDetail = licenceOrderApiService.getLicenceOrderDetail(orderId, null); ServiceResponse<LicenceOrderDTO> licenceOrderDetail = licenceOrderApiService.getLicenceOrderDetail(orderId, null);
LicenceOrderVO licenceOrderVO = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderDetail.getResult()), LicenceOrderVO.class); LicenceOrderVO licenceOrderVO = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderDetail.getResult()), LicenceOrderVO.class);
return RestResponse.successResult(licenceOrderVO); return RestResponse.successResult(licenceOrderVO);
...@@ -68,7 +72,11 @@ public class LicenceOrderController { ...@@ -68,7 +72,11 @@ public class LicenceOrderController {
* 分页查询订单列表 * 分页查询订单列表
*/ */
@RequestMapping("licence-order-page") @RequestMapping("licence-order-page")
public RestResponse<Page<LicenceOrderPageVO>> getLicenceOrderPage(@RequestBody LicenceOrderPageQO licenceOrderPageQO) { public RestResponse<Page<LicenceOrderPageVO>> getLicenceOrderPage(@RequestBody LicenceOrderPageQO licenceOrderPageQO, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
LicenceOrderPageQDTO qdto = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderPageQO), LicenceOrderPageQDTO.class); LicenceOrderPageQDTO qdto = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderPageQO), LicenceOrderPageQDTO.class);
qdto.setType(0); qdto.setType(0);
ServiceResponse<Page<LicenceOrderPageDTO>> licenceOrderPage = licenceOrderApiService.getLicenceOrderPage(qdto); ServiceResponse<Page<LicenceOrderPageDTO>> licenceOrderPage = licenceOrderApiService.getLicenceOrderPage(qdto);
...@@ -93,7 +101,11 @@ public class LicenceOrderController { ...@@ -93,7 +101,11 @@ public class LicenceOrderController {
* 取消订单 * 取消订单
*/ */
@RequestMapping("licence-order-cancel") @RequestMapping("licence-order-cancel")
public RestResponse<Boolean> cancelLicenceOrder(@RequestParam Long orderId) { public RestResponse<Boolean> cancelLicenceOrder(@RequestParam Long orderId, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
ServiceResponse<Boolean> response = licenceOrderApiService.cancelQywxOrder(orderId); ServiceResponse<Boolean> response = licenceOrderApiService.cancelQywxOrder(orderId);
if (!response.isSuccess()) { if (!response.isSuccess()) {
return RestResponse.failure(response.getCode(), response.getMessage()); return RestResponse.failure(response.getCode(), response.getMessage());
...@@ -105,7 +117,11 @@ public class LicenceOrderController { ...@@ -105,7 +117,11 @@ public class LicenceOrderController {
* 支付订单 * 支付订单
*/ */
@RequestMapping("licence-order-pay") @RequestMapping("licence-order-pay")
public RestResponse<String> payLicenceOrder(@RequestParam Long orderId) { public RestResponse<String> payLicenceOrder(@RequestParam Long orderId, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
ServiceResponse<String> response = licenceOrderApiService.payLicenceOrder(orderId); ServiceResponse<String> response = licenceOrderApiService.payLicenceOrder(orderId);
if (response.isSuccess()) { if (response.isSuccess()) {
return RestResponse.successResult(response.getResult()); return RestResponse.successResult(response.getResult());
...@@ -140,7 +156,11 @@ public class LicenceOrderController { ...@@ -140,7 +156,11 @@ public class LicenceOrderController {
* @return * @return
*/ */
@RequestMapping("get-order-id-list") @RequestMapping("get-order-id-list")
public RestResponse<List<String>> getOrderIdList(String param, Integer type) { public RestResponse<List<String>> getOrderIdList(String param, Integer type, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
ServiceResponse<List<String>> orderIdList = licenceOrderApiService.getOrderIdList(param, type, null); ServiceResponse<List<String>> orderIdList = licenceOrderApiService.getOrderIdList(param, type, null);
return RestResponse.successResult(orderIdList.getResult()); return RestResponse.successResult(orderIdList.getResult());
} }
...@@ -149,9 +169,31 @@ public class LicenceOrderController { ...@@ -149,9 +169,31 @@ public class LicenceOrderController {
* 查询开户信息 * 查询开户信息
*/ */
@RequestMapping("get-account-info") @RequestMapping("get-account-info")
public RestResponse<HashMap<String, String>> getAccountInfo() { public RestResponse<HashMap<String, String>> getAccountInfo(HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
HashMap<String, String> result = licenceOrderApiService.getAccountInfo().getResult(); HashMap<String, String> result = licenceOrderApiService.getAccountInfo().getResult();
return RestResponse.successResult(result); return RestResponse.successResult(result);
} }
/**
* 申请微信退款
*/
@RequestMapping("licence-order-wxRefoud")
public RestResponse<Boolean> wxRefund(@RequestParam Long orderId, HttpServletRequest request) {
AuthcenterUserDetails loginUser = (AuthcenterUserDetails) SessionContextUtil.getUser(request);
if (loginUser == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
}
ServiceResponse<Boolean> response = licenceOrderApiService.wxRefund(orderId);
if (response.isSuccess()){
return RestResponse.successResult(true);
}
return RestResponse.failure(response.getCode(), response.getMessage());
}
} }
...@@ -330,7 +330,9 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -330,7 +330,9 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
return ServiceResponse.failure("-9999", "订单id有误!"); return ServiceResponse.failure("-9999", "订单id有误!");
} }
if (2 == order.getPayType()) { if (2 == order.getPayType()) {
return ServiceResponse.failure("-9999", "对公转账类型不需要申请微信退款!"); //对公转账不需要微信退款,直接更新微信订单状态
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 4, order.getEnterpriseId(), order.getWxEnterpriseId(), "系统", 1);
return ServiceResponse.success(true);
} }
if (4 == order.getOrderStatus()){ if (4 == order.getOrderStatus()){
return ServiceResponse.failure("-9999", "该笔订单已退款!"); return ServiceResponse.failure("-9999", "该笔订单已退款!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment