|
@@ -65,7 +65,7 @@ public class PayServlet extends HttpServlet {
|
|
|
if (action.equals("alipay")) {
|
|
if (action.equals("alipay")) {
|
|
|
|
|
|
|
|
System.out.println("================== ali pay action begin ==================");
|
|
System.out.println("================== ali pay action begin ==================");
|
|
|
- int memberpk = CommentUtils.myToInt(request.getParameter("memberpk"));//会员pk
|
|
|
|
|
|
|
+ int memberpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("memberpk")));//会员pk
|
|
|
String abs = CommentUtils.myToString(request.getParameter("abs"));//摘要
|
|
String abs = CommentUtils.myToString(request.getParameter("abs"));//摘要
|
|
|
String intro = CommentUtils.myToString(request.getParameter("intro"));//说明
|
|
String intro = CommentUtils.myToString(request.getParameter("intro"));//说明
|
|
|
|
|
|
|
@@ -201,7 +201,7 @@ public class PayServlet extends HttpServlet {
|
|
|
|
|
|
|
|
// 取现记录
|
|
// 取现记录
|
|
|
else if (action.equals("dogetoutcash")) {
|
|
else if (action.equals("dogetoutcash")) {
|
|
|
- int memberpk = CommentUtils.myToInt(request.getParameter("memberpk"));//会员pk
|
|
|
|
|
|
|
+ int memberpk = Integer.parseInt(CommentUtils.myToString(request.getParameter("memberpk")));//会员pk
|
|
|
String type = CommentUtils.myToString(request.getParameter("type"));
|
|
String type = CommentUtils.myToString(request.getParameter("type"));
|
|
|
String state = CommentUtils.myToString(request.getParameter("state"));
|
|
String state = CommentUtils.myToString(request.getParameter("state"));
|
|
|
if (type.equals("1") || type.equals("2")) {
|
|
if (type.equals("1") || type.equals("2")) {
|
|
@@ -236,7 +236,7 @@ public class PayServlet extends HttpServlet {
|
|
|
|
|
|
|
|
//获取我收到的红包列表
|
|
//获取我收到的红包列表
|
|
|
else if (action.equals("getreceiveredlist")) {
|
|
else if (action.equals("getreceiveredlist")) {
|
|
|
- int memberPk = CommentUtils.myToInt(request.getParameter("memberpk"));//会员PK
|
|
|
|
|
|
|
+ int memberPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("MemberPk")));//会员PK
|
|
|
List<RedPacket> list = payService.getReceiveRedList(memberPk);
|
|
List<RedPacket> list = payService.getReceiveRedList(memberPk);
|
|
|
if (list != null) {
|
|
if (list != null) {
|
|
|
resultJson.put("msg", Constants.success);
|
|
resultJson.put("msg", Constants.success);
|
|
@@ -248,7 +248,7 @@ public class PayServlet extends HttpServlet {
|
|
|
//发红包
|
|
//发红包
|
|
|
else if (action.equals("givered")) {
|
|
else if (action.equals("givered")) {
|
|
|
int modelPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("ModelPk")));//人才pk
|
|
int modelPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("ModelPk")));//人才pk
|
|
|
- int memberPk = CommentUtils.myToInt(request.getParameter("memberpk"));//会员PK
|
|
|
|
|
|
|
+ int memberPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("MemberPk")));//会员PK
|
|
|
double coin = Double.parseDouble(CommentUtils.myToString(request.getParameter("coin")));// 红包
|
|
double coin = Double.parseDouble(CommentUtils.myToString(request.getParameter("coin")));// 红包
|
|
|
|
|
|
|
|
int code = payService.giveRed(modelPk, memberPk, coin);
|
|
int code = payService.giveRed(modelPk, memberPk, coin);
|
|
@@ -278,6 +278,18 @@ public class PayServlet extends HttpServlet {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //送礼物
|
|
|
|
|
+ else if (action.equals("sendgift")){
|
|
|
|
|
+ double coin = Double.parseDouble(CommentUtils.myToString(request.getParameter("coin")));
|
|
|
|
|
+ int modelPk = Integer.parseInt(CommentUtils.myToString(request.getParameter("modelpk")));
|
|
|
|
|
+ int memberPk = CommentUtils.myToInt(request.getParameter("memberpk"));
|
|
|
|
|
+ int activitypk = CommentUtils.myToInt(request.getParameter("activitypk"));
|
|
|
|
|
+ String memberpk = request.getParameter("giftname");
|
|
|
|
|
+
|
|
|
|
|
+ String msg = payService.sendGift(memberPk, modelPk, activitypk, coin, memberpk);
|
|
|
|
|
+ resultJson.put("msg", msg);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
resultJson.put("msg", Constants.error);
|
|
resultJson.put("msg", Constants.error);
|