czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通用文件上传

Browse Source 
团购卷支付
This commit is contained in:
wangw
2024-05-15 16:50:39 +08:00
parent 5f88c35dc7
commit fb86b296cb
3 changed files with 268 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@@ -37,12 +37,26 @@ public class PayController {
* @return
*/
@RequestMapping("orderPay")
public Result pay(HttpServletRequest request, @RequestHeader("openId") String openId, @RequestBody Map<String,String> map) {
if(ObjectUtil.isEmpty(map)||map.size()<=0||!map.containsKey("orderId")||ObjectUtil.isEmpty(map.get("orderId"))){
return Result.fail("订单号不允许为空");
}
try {
return payService.payOrder(openId,map.get("orderId").toString(), IpUtil.getIpAddr(request));
} catch (Exception e) {
e.printStackTrace();
}
return Result.fail("支付失败");
}
@RequestMapping("groupOrderPay")
public Result pay(HttpServletRequest request, @RequestHeader String environment,@RequestHeader String token, @RequestBody Map<String, String> map) {
if (ObjectUtil.isEmpty(map) || map.size() <= 0 || !map.containsKey("orderId") || ObjectUtil.isEmpty(map.get("orderId"))) {
return Result.fail("订单号不允许为空");
}
String orderId = map.get("orderId").toString();
String orderType = map.get("orderType").toString();
// String orderType = map.get("orderType").toString();
String payType = map.get("payType").toString();
String userId="";
if(environment.equals("wx")){
@@ -50,25 +64,18 @@ public class PayController {
}else {
userId = TokenUtil.parseParamFromToken(token).getString("userId");
}
log.info("订单支付 orderId:{},orderType:{},payType={},userId:{}",orderId,orderType,payType,userId);
log.info("订单支付 orderId:{},payType={},userId:{}",orderId,payType,userId);
try {
if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){
return payService.groupOrderPay(orderId, payType, userId, IpUtil.getIpAddr(request));
}else {
return payService.payOrder(userId, orderId, payType, IpUtil.getIpAddr(request));
}
// if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){
// return payService.groupOrderPay(orderId, payType, userId, IpUtil.getIpAddr(request));
// }
return payService.groupOrderPay(orderId, payType, userId, IpUtil.getIpAddr(request));
} catch (Exception e) {
e.printStackTrace();
}
return Result.fail("支付失败");
}
@RequestMapping("returnGpOrder")
public Result returnOrder(@RequestBody ReturnGroupOrderDto param){
return payService.returnOrder(param);
}
//
// public Result memberAccountPay(@RequestHeader("openId") String openId,
// @RequestParam("orderId") String orderId,