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:
韩鹏辉
2024-05-22 18:09:01 +08:00
parent 2f84bed116
commit 75b451cdda
12 changed files with 135 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +1,17 @@
package com.chaozhanggui.system.cashierservice.controller;
import cn.hutool.core.util.ObjectUtil;
import com.chaozhanggui.system.cashierservice.entity.TbOrderDetail;
import com.chaozhanggui.system.cashierservice.entity.dto.ReturnGroupOrderDto;
import com.chaozhanggui.system.cashierservice.service.PayService;
import com.chaozhanggui.system.cashierservice.sign.Result;
import com.chaozhanggui.system.cashierservice.util.IpUtil;
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@CrossOrigin(origins = "*")
@@ -31,19 +28,18 @@ public class PayController {
/**
* 支付
*
* @param request
* payType wechatPay:微信支付；aliPay:支付宝支付；
* @param request payType wechatPay:微信支付；aliPay:支付宝支付；
* @param map
* @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"))){
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));
return payService.payOrder(openId, map.get("orderId"), IpUtil.getIpAddr(request));
} catch (Exception e) {
e.printStackTrace();
}
@@ -51,10 +47,9 @@ public class PayController {
}
/**
* 储值卡支付
*
* @param token
* @param orderId
* @param memberId
@@ -64,26 +59,26 @@ public class PayController {
public Result accountPay(@RequestHeader("token") String token,
@RequestParam("orderId") String orderId,
@RequestParam("memberId") String memberId
){
return payService.accountPay(orderId,memberId,token);
) {
return payService.accountPay(orderId, memberId, token);
}
@RequestMapping("groupOrderPay")
public Result groupOrderPay(HttpServletRequest request, @RequestHeader String environment,@RequestHeader String token, @RequestBody Map<String, String> map) {
public Result groupOrderPay(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 orderId = map.get("orderId");
// String orderType = map.get("orderType").toString();
String payType = map.get("payType").toString();
String userId="";
if(environment.equals("wx")){
String payType = map.get("payType");
String userId = "";
if (environment.equals("wx")) {
userId = TokenUtil.parseParamFromToken(token).getString("openId");
}else {
} else {
userId = TokenUtil.parseParamFromToken(token).getString("userId");
}
//订单支付 orderId:62,payType=wechatPay,userId:or1l860rwM-rU_j9KrgMOwued
log.info("订单支付 orderId:{},payType={},userId:{}",orderId,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));
@@ -132,8 +127,8 @@ public class PayController {
@RequestHeader("token") String token,
@RequestParam("shopId") String shopId,
@RequestParam("page") int page,
@RequestParam("pageSize") int pageSize){
return payService.getActivate(shopId,page,pageSize);
@RequestParam("pageSize") int pageSize) {
return payService.getActivate(shopId, page, pageSize);
}
@@ -149,7 +144,22 @@ public class PayController {
public Result memeberIn(HttpServletRequest request, @RequestHeader("openId") String openId, @RequestHeader("id") String id,
@RequestBody Map<String, Object> map
) {
return payService.memberIn(openId, id, map.get("amount").toString(), map.get("shopId").toString(), IpUtil.getIpAddr(request));
try {
return payService.memberIn(openId, id, map.get("amount").toString(), map.get("shopId").toString(), IpUtil.getIpAddr(request));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}
@RequestMapping("getShopByMember")
public Result getShopByMember(@RequestHeader("token") String token,
@RequestParam("page") int page,
@RequestParam("pageSize") int pageSize,
@RequestParam("userId") String userId,
@RequestParam("shopId") String shopId
) {
return payService.getShopByMember(userId,shopId,page,pageSize);
}