修改金豆为金币
This commit is contained in:
@@ -161,7 +161,7 @@ public class CashController {
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/selectSumPay", method = RequestMethod.GET)
|
||||
@ApiOperation("查询用户充值金豆")
|
||||
@ApiOperation("查询用户充值金币")
|
||||
@ResponseBody
|
||||
public Result selectSumPay(String createTime, String endTime, Long userId) {
|
||||
return Result.success().put("data", payDetailsService.selectSumPay(createTime, endTime, userId));
|
||||
@@ -308,7 +308,7 @@ public class CashController {
|
||||
AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
|
||||
request.setBizContent("{" +
|
||||
"\"out_biz_no\":\"" + one.getOrderNumber() + "\"," + //订单编号
|
||||
"\"trans_amount\":" + new BigDecimal(one.getMoney()) + "," + //转账金豆
|
||||
"\"trans_amount\":" + new BigDecimal(one.getMoney()) + "," + //转账金币
|
||||
"\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," +
|
||||
"\"biz_scene\":\"DIRECT_TRANSFER\"," +
|
||||
"\"order_title\":\"" + name.getValue() + "佣金结算" + "\"," +
|
||||
@@ -343,7 +343,7 @@ public class CashController {
|
||||
return Result.error(9999, one.getZhifubaoName() + "转账失败!" + response.getSubMsg());
|
||||
}
|
||||
} catch (AlipayApiException e) {
|
||||
log.error("金豆提现异常原因:" + e.getMessage());
|
||||
log.error("金币提现异常原因:" + e.getMessage());
|
||||
e.printStackTrace();
|
||||
return Result.error(9999, one.getZhifubaoName() + "转账失败!" + e.getMessage());
|
||||
|
||||
@@ -385,7 +385,7 @@ public class CashController {
|
||||
return Result.error(9999, one.getZhifubaoName() + "转账失败!" + response.getSubMsg());
|
||||
}
|
||||
} catch (AlipayApiException e) {
|
||||
log.error("金豆提现异常原因:" + e.getMessage());
|
||||
log.error("金币提现异常原因:" + e.getMessage());
|
||||
e.printStackTrace();
|
||||
return Result.error(9999, one.getZhifubaoName() + "转账失败!" + e.getMessage());
|
||||
|
||||
@@ -439,7 +439,7 @@ public class CashController {
|
||||
if (one.getRate() != null && one.getRate() > 0.00) {
|
||||
v = AmountCalUtils.add(new BigDecimal(v), BigDecimal.valueOf(one.getRate())).doubleValue();
|
||||
}
|
||||
//将金豆退还
|
||||
//将金币退还
|
||||
if (one.getSysUserId() != null) {
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setSysUserId(one.getSysUserId());
|
||||
|
||||
@@ -153,8 +153,8 @@ public class AliPayController {
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(add);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("支付宝充值金豆");
|
||||
userMoneyDetails.setTitle("支付宝充值金豆:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setContent("支付宝充值金币");
|
||||
userMoneyDetails.setTitle("支付宝充值金币:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
|
||||
@@ -239,8 +239,8 @@ public class AliPayController {
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(add);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("支付宝充值金豆");
|
||||
userMoneyDetails.setTitle("支付宝充值金豆:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setContent("支付宝充值金币");
|
||||
userMoneyDetails.setTitle("支付宝充值金币:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
|
||||
@@ -350,7 +350,7 @@ public class AliPayController {
|
||||
AlipayTradeRefundModel model = new AlipayTradeRefundModel();
|
||||
model.setOutTradeNo(orders.getOrdersNo());//订单编号
|
||||
model.setTradeNo(orders.getTradeNo());//支付宝订单交易号
|
||||
model.setRefundAmount(orders.getPayMoney().toString());//退款金豆 不得大于订单金豆
|
||||
model.setRefundAmount(orders.getPayMoney().toString());//退款金币 不得大于订单金币
|
||||
model.setRefundReason(orders.getRefundContent());//退款说明
|
||||
model.setOutRequestNo(orders.getOrdersNo());//标识一次退款请求,同一笔交易多次退款需要保证唯一,如需部分退款,则此参数必传。
|
||||
alipay_request.setBizModel(model);
|
||||
@@ -483,7 +483,7 @@ public class AliPayController {
|
||||
order.put("subject", name); //商品标题
|
||||
order.put("product_code", "QUICK_WAP_WAY");
|
||||
order.put("body", name);//商品名称
|
||||
order.put("total_amount", money + ""); //金豆
|
||||
order.put("total_amount", money + ""); //金币
|
||||
alipayRequest.setBizContent(order.toString());
|
||||
alipayRequest.setNotifyUrl(url); //在公共参数中设置回跳和通知地址
|
||||
alipayRequest.setReturnUrl(returnUrl); //线上通知页面地址
|
||||
@@ -497,7 +497,7 @@ public class AliPayController {
|
||||
order.put("subject", name); //商品标题
|
||||
order.put("product_code", "QUICK_WAP_WAY");
|
||||
order.put("body", name);//商品名称
|
||||
order.put("total_amount", money); //金豆
|
||||
order.put("total_amount", money); //金币
|
||||
alipayRequest.setBizContent(order.toString());
|
||||
//在公共参数中设置回跳和通知地址
|
||||
alipayRequest.setNotifyUrl(url);
|
||||
|
||||
@@ -77,14 +77,14 @@ public class ApiWeiXinPayController {
|
||||
}
|
||||
|
||||
@Login
|
||||
@ApiOperation("充值金豆")
|
||||
@ApiOperation("充值金币")
|
||||
@PostMapping("/payMoney")
|
||||
public Result payMoney(Long payClassifyId, Integer classify,@RequestAttribute Long userId) throws Exception {
|
||||
return wxService.payMoney(payClassifyId,userId,classify);
|
||||
}
|
||||
|
||||
@Login
|
||||
@ApiOperation("充值金豆(只生成订单号)")
|
||||
@ApiOperation("充值金币(只生成订单号)")
|
||||
@PostMapping("/payMoneyOrders")
|
||||
public Result payMoneyOrders(Long payClassifyId, Integer classify,@RequestAttribute Long userId) throws Exception {
|
||||
return wxService.payMoneyOrders(payClassifyId,userId,classify);
|
||||
@@ -212,7 +212,7 @@ public class ApiWeiXinPayController {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,7 +38,7 @@ public class AppCashController {
|
||||
|
||||
@Login
|
||||
@GetMapping(value = "/cashMoney")
|
||||
@ApiOperation("发起提现 余额 金豆")
|
||||
@ApiOperation("发起提现 余额 金币")
|
||||
public Result cashMoney(@RequestAttribute("userId") Long userId, Double money) {
|
||||
return cashOutService.cashMoney(userId, money);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public class DyPayController {
|
||||
}
|
||||
|
||||
@Login
|
||||
@ApiOperation("充值金豆")
|
||||
@ApiOperation("充值金币")
|
||||
@PostMapping("/payMoney")
|
||||
public Result payMoney(Long payClassifyId,@RequestAttribute Long userId) throws Exception {
|
||||
return dyService.payMoney(payClassifyId,userId);
|
||||
|
||||
@@ -122,7 +122,7 @@ public class IosPayController {
|
||||
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
|
||||
userMoneyDetails.setMoney(payClassify.getMoney());
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("苹果充值金豆");
|
||||
userMoneyDetails.setContent("苹果充值金币");
|
||||
userMoneyDetails.setTitle("苹果充值:"+payClassify.getMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
|
||||
@@ -29,7 +29,7 @@ public class KsPayController {
|
||||
}
|
||||
|
||||
@Login
|
||||
@ApiOperation("充值金豆")
|
||||
@ApiOperation("充值金币")
|
||||
@PostMapping("/payMoney")
|
||||
public Result payMoney(Long payClassifyId, @RequestAttribute Long userId) throws Exception {
|
||||
return ksService.payMoney(payClassifyId,userId);
|
||||
|
||||
@@ -289,7 +289,7 @@ public class WuyouController {
|
||||
case 1:
|
||||
UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
|
||||
sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 8, 1, 2,
|
||||
completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务,额外奖励金豆" + completAward.getAwardNumber(), 2);
|
||||
completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务,额外奖励金币" + completAward.getAwardNumber(), 2);
|
||||
|
||||
userMoneyService.updateMoney(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
|
||||
userMoneyDetailsService.save(userMoneyDetails1);
|
||||
|
||||
@@ -15,7 +15,7 @@ public class AliPayParamModel {
|
||||
private String out_trade_no;
|
||||
|
||||
/**
|
||||
* 订单金豆
|
||||
* 订单金币
|
||||
*/
|
||||
private String total_amount;
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ public class AliPayWithdrawModel {
|
||||
private String payee_type = "ALIPAY_LOGONID";
|
||||
|
||||
/**
|
||||
* 提现金豆
|
||||
* 提现金币
|
||||
*/
|
||||
private BigDecimal amount;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ public class CashOut implements Serializable {
|
||||
private String outAt;
|
||||
|
||||
/**
|
||||
* 提现金豆
|
||||
* 提现金币
|
||||
*/
|
||||
private String money;
|
||||
|
||||
@@ -107,4 +107,4 @@ public class CashOut implements Serializable {
|
||||
@TableField(exist = false)
|
||||
private String sysUserName;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public class PayDetails implements Serializable {
|
||||
private String tradeNo;
|
||||
|
||||
/**
|
||||
* 充值金豆
|
||||
* 充值金币
|
||||
*/
|
||||
private Double money;
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
titles.add("用户名称");
|
||||
titles.add("支付宝账号");
|
||||
titles.add("支付宝名称");
|
||||
titles.add("提现金豆");
|
||||
titles.add("提现金币");
|
||||
titles.add("状态");
|
||||
titles.add("拒绝原因");
|
||||
titles.add("申请时间");
|
||||
@@ -158,7 +158,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
MessageInfo messageInfo = new MessageInfo();
|
||||
messageInfo.setState(String.valueOf(5));
|
||||
messageInfo.setIsSee("0");
|
||||
messageInfo.setContent("您好,您的提现转账成功,请注意查收!提现金豆【" + money + "元】!支付宝收款账号 " + payWay + "感谢您的使用!如有疑问请在公众号中发送您的问题联系客服");
|
||||
messageInfo.setContent("您好,您的提现转账成功,请注意查收!提现金币【" + money + "元】!支付宝收款账号 " + payWay + "感谢您的使用!如有疑问请在公众号中发送您的问题联系客服");
|
||||
messageInfo.setTitle("提现成功通知");
|
||||
messageInfo.setUserName(userByWxId.getUserName());
|
||||
messageInfo.setUserId(String.valueOf(userByWxId.getUserId()));
|
||||
@@ -167,7 +167,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
messageInfo.setCreateAt(sdf.format(now));
|
||||
messageInfoDao.insert(messageInfo);
|
||||
if (userByWxId.getClientid() != null) {
|
||||
userService.pushToSingle("提现成功通知", "您好,您的提现转账成功,请注意查收!提现金豆【" + money + "元】!支付宝收款账号 " + payWay + "感谢您的使用!如有疑问请在公众号中发送您的问题联系客服", userByWxId.getClientid());
|
||||
userService.pushToSingle("提现成功通知", "您好,您的提现转账成功,请注意查收!提现金币【" + money + "元】!支付宝收款账号 " + payWay + "感谢您的使用!如有疑问请在公众号中发送您的问题联系客服", userByWxId.getClientid());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,17 +278,17 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
@Transactional
|
||||
public Result cashMoney(Long userId, Double money) {
|
||||
if (money == null || money <= 0.00) {
|
||||
return Result.error("请不要输入小于0的数字,请输入正确的提现金豆!");
|
||||
return Result.error("请不要输入小于0的数字,请输入正确的提现金币!");
|
||||
}
|
||||
//最低提现金豆
|
||||
//最低提现金币
|
||||
CommonInfo one = commonInfoService.findOne(112);
|
||||
if (one != null && money < Double.parseDouble(one.getValue())) {
|
||||
return Result.error("输入金豆不满足最低提现金豆,请重新输入!");
|
||||
return Result.error("输入金币不满足最低提现金币,请重新输入!");
|
||||
}
|
||||
//最高提现金豆
|
||||
//最高提现金币
|
||||
CommonInfo one2 = commonInfoService.findOne(153);
|
||||
if (one2 != null && money >= Double.parseDouble(one2.getValue())) {
|
||||
return Result.error(-100, "输入金豆过大,不能大于" + one2.getValue() + ",请重新输入!");
|
||||
return Result.error(-100, "输入金币过大,不能大于" + one2.getValue() + ",请重新输入!");
|
||||
}
|
||||
//手续费
|
||||
CommonInfo one1 = commonInfoService.findOne(152);
|
||||
@@ -299,13 +299,13 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
// UserMoney userMoney=userMoneyService.selectUserMoneyByUserId(userId);
|
||||
InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId);
|
||||
UserEntity userEntity = userService.selectUserById(userId);
|
||||
// 提现判断金豆是否足够 金豆=提现金豆+手续费
|
||||
// 提现判断金币是否足够 金币=提现金币+手续费
|
||||
Double moneySum = AmountCalUtils.add(new BigDecimal(money), new BigDecimal(mul)).doubleValue();
|
||||
// 用户金豆足够
|
||||
// 用户金币足够
|
||||
if (inviteMoney.getMoney() >= moneySum) {
|
||||
//扣除可提现金豆
|
||||
//扣除可提现金币
|
||||
inviteMoneyService.updateInviteMoneyCashOut(2, moneySum, userId);
|
||||
//增加金豆操作记录
|
||||
//增加金币操作记录
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("提现:" + money);
|
||||
@@ -331,7 +331,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
// inviteMoneyDao.updateInviteMoneyCashOut(1,money,userId);
|
||||
return Result.success("提现成功,将在三个工作日内到账,请耐心等待!");
|
||||
} else {
|
||||
return Result.error("金豆不足,请输入正确的提现金豆!");
|
||||
return Result.error("金币不足,请输入正确的提现金币!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -339,17 +339,17 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
@Transactional
|
||||
public Result sysCashMoney(Long userId, Double money) {
|
||||
if (money == null || money <= 0.00) {
|
||||
return Result.error("请不要输入小于0的数字,请输入正确的提现金豆!");
|
||||
return Result.error("请不要输入小于0的数字,请输入正确的提现金币!");
|
||||
}
|
||||
//最低提现金豆
|
||||
//最低提现金币
|
||||
CommonInfo one = commonInfoService.findOne(112);
|
||||
if (one != null && money < Double.parseDouble(one.getValue())) {
|
||||
return Result.error("输入金豆不满足最低提现金豆,请重新输入!");
|
||||
return Result.error("输入金币不满足最低提现金币,请重新输入!");
|
||||
}
|
||||
//最高提现金豆
|
||||
//最高提现金币
|
||||
CommonInfo one2 = commonInfoService.findOne(153);
|
||||
if (one2 != null && money >= Double.parseDouble(one2.getValue())) {
|
||||
return Result.error(-100, "输入金豆过大,不能大于" + one2.getValue() + ",请重新输入!");
|
||||
return Result.error(-100, "输入金币过大,不能大于" + one2.getValue() + ",请重新输入!");
|
||||
}
|
||||
//手续费
|
||||
CommonInfo one1 = commonInfoService.findOne(152);
|
||||
@@ -360,13 +360,13 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
UserMoney userMoney = userMoneyService.selectSysUserMoneyByUserId(userId);
|
||||
|
||||
SysUserEntity sysUserEntity = sysUserService.getById(userId);
|
||||
//提现判断金豆是否足够 金豆=提现金豆+手续费
|
||||
//提现判断金币是否足够 金币=提现金币+手续费
|
||||
double moneySum = AmountCalUtils.add(new BigDecimal(money), new BigDecimal(mul)).doubleValue();
|
||||
// 用户金豆足够
|
||||
// 用户金币足够
|
||||
if (userMoney.getMoney().doubleValue() >= moneySum) {
|
||||
//扣除可提现金豆
|
||||
//扣除可提现金币
|
||||
userMoneyService.updateSysMoney(2, userId, moneySum);
|
||||
//增加金豆操作记录
|
||||
//增加金币操作记录
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setSysUserId(userId);
|
||||
userMoneyDetails.setTitle("提现:" + money);
|
||||
@@ -393,7 +393,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
||||
// inviteMoneyDao.updateInviteMoneyCashOut(1,money,userId);
|
||||
return Result.success("提现成功,将在三个工作日内到账,请耐心等待!");
|
||||
} else {
|
||||
return Result.error("金豆不足,请输入正确的提现金豆!");
|
||||
return Result.error("金币不足,请输入正确的提现金币!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -310,7 +310,7 @@ public class DyServiceImpl implements DyService {
|
||||
|
||||
/**
|
||||
* 抖音支付订单生成
|
||||
* @param moneys 支付金豆 带小数点
|
||||
* @param moneys 支付金币 带小数点
|
||||
* @param outTradeNo 单号
|
||||
* @return
|
||||
* @throws Exception
|
||||
@@ -329,7 +329,7 @@ public class DyServiceImpl implements DyService {
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("app_id",appId);
|
||||
params.put("out_order_no", outTradeNo); //商户订单号
|
||||
params.put("total_amount", money); //金豆。分
|
||||
params.put("total_amount", money); //金币。分
|
||||
params.put("notify_url", url); //回调接口
|
||||
params.put("subject", one.getValue()); //主题
|
||||
params.put("body", one.getValue()); //商品详情
|
||||
@@ -399,7 +399,7 @@ public class DyServiceImpl implements DyService {
|
||||
}
|
||||
String orderNo = msgJson.getString("cp_orderno"); //商户订单号
|
||||
String order_id = msgJson.getString("order_id"); //抖音订单id
|
||||
Integer orderAmount = msgJson.getInteger("total_amount"); //支付金豆
|
||||
Integer orderAmount = msgJson.getInteger("total_amount"); //支付金币
|
||||
|
||||
//todo 处理支付成功后的订单业务
|
||||
log.error("订单号!!"+orderNo);
|
||||
@@ -440,7 +440,7 @@ public class DyServiceImpl implements DyService {
|
||||
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
|
||||
userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney()));
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("抖音充值金豆");
|
||||
userMoneyDetails.setContent("抖音充值金币");
|
||||
userMoneyDetails.setTitle("抖音充值:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
@@ -534,11 +534,11 @@ public class DyServiceImpl implements DyService {
|
||||
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
if(StringUtils.isNotEmpty(currency) && "DIAMOND".equals(currency)){
|
||||
userMoneyDetails.setContent("抖音钻石充值金豆");
|
||||
userMoneyDetails.setContent("抖音钻石充值金币");
|
||||
userMoneyDetails.setTitle("抖音充值:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setMoney(payDetails.getPayDiamond());
|
||||
}else{
|
||||
userMoneyDetails.setContent("抖音充值金豆");
|
||||
userMoneyDetails.setContent("抖音充值金币");
|
||||
userMoneyDetails.setTitle("抖音充值:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney()));
|
||||
}
|
||||
@@ -596,7 +596,7 @@ public class DyServiceImpl implements DyService {
|
||||
params.put("out_order_no", orders.getOrdersNo()); //商户订单号
|
||||
params.put("out_refund_no", orders.getOrdersNo());
|
||||
params.put("reason", "系统退款");
|
||||
params.put("total_amount", new Double(orders.getPayMoney().doubleValue()*100).intValue()+""); //金豆。分
|
||||
params.put("total_amount", new Double(orders.getPayMoney().doubleValue()*100).intValue()+""); //金币。分
|
||||
String SALT = commonInfoService.findOne(815).getValue();
|
||||
String sign = DouYinSign.requestSign(params,SALT); //签名
|
||||
params.put("sign",sign);
|
||||
|
||||
@@ -111,7 +111,7 @@ public class KsServiceImpl implements KsService {
|
||||
|
||||
/**
|
||||
* 快手支付订单生成
|
||||
* @param moneys 支付金豆 带小数点
|
||||
* @param moneys 支付金币 带小数点
|
||||
* @param outTradeNo 单号
|
||||
* @return
|
||||
* @throws Exception
|
||||
@@ -130,7 +130,7 @@ public class KsServiceImpl implements KsService {
|
||||
params.put("app_id",appId);
|
||||
params.put("out_order_no", outTradeNo); //商户订单号
|
||||
params.put("open_id", openId);
|
||||
params.put("total_amount", money); //金豆。分
|
||||
params.put("total_amount", money); //金币。分
|
||||
params.put("notify_url", url); //回调接口
|
||||
params.put("subject", one.getValue()); //主题
|
||||
params.put("detail", one.getValue()); //商品详情
|
||||
@@ -212,7 +212,7 @@ public class KsServiceImpl implements KsService {
|
||||
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
|
||||
userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney()));
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("快手充值金豆");
|
||||
userMoneyDetails.setContent("快手充值金币");
|
||||
userMoneyDetails.setTitle("快手充值:"+payDetails.getMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
@@ -282,7 +282,7 @@ public class KsServiceImpl implements KsService {
|
||||
params.put("out_refund_no", orders.getOrdersNo());
|
||||
params.put("notify_url", url);
|
||||
params.put("reason", "系统退款");
|
||||
params.put("refund_amount", new Double(orders.getPayMoney().doubleValue()*100).intValue()+""); //金豆。分
|
||||
params.put("refund_amount", new Double(orders.getPayMoney().doubleValue()*100).intValue()+""); //金币。分
|
||||
String sign = calcSign(params); //签名
|
||||
params.put("sign",sign);
|
||||
//发起post请求
|
||||
|
||||
@@ -135,7 +135,7 @@ public class WxServiceImpl implements WxService {
|
||||
|
||||
/**
|
||||
* 微信支付订单生成
|
||||
* @param moneys 支付金豆 带小数点
|
||||
* @param moneys 支付金币 带小数点
|
||||
* @param type 类型 1app 2 二维码支付 3小程序 公众号支付
|
||||
* @param userId 用户id
|
||||
* @param outTradeNo 单号
|
||||
@@ -314,8 +314,8 @@ public class WxServiceImpl implements WxService {
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(add);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("微信充值金豆");
|
||||
userMoneyDetails.setTitle("微信充值金豆:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setContent("微信充值金币");
|
||||
userMoneyDetails.setTitle("微信充值金币:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
|
||||
@@ -393,8 +393,8 @@ public class WxServiceImpl implements WxService {
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(add);
|
||||
userMoneyDetails.setUserId(payDetails.getUserId());
|
||||
userMoneyDetails.setContent("微信充值金豆");
|
||||
userMoneyDetails.setTitle("微信充值金豆:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setContent("微信充值金币");
|
||||
userMoneyDetails.setTitle("微信充值金币:"+payClassify.getMoney()+",赠送:"+payClassify.getGiveMoney());
|
||||
userMoneyDetails.setType(1);
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
|
||||
@@ -429,7 +429,7 @@ public class WxServiceImpl implements WxService {
|
||||
e.printStackTrace();
|
||||
}
|
||||
int commInfoId = 0;
|
||||
Integer payWay = orders.getPayWay(); //支付方式(1app微信 2微信公众号 3微信小程序 4app支付宝 5H5支付宝 6金豆)
|
||||
Integer payWay = orders.getPayWay(); //支付方式(1app微信 2微信公众号 3微信小程序 4app支付宝 5H5支付宝 6金币)
|
||||
switch (payWay){
|
||||
case 1 : commInfoId = 74; break; //appId
|
||||
case 2 : commInfoId = 5; break; //公众号id
|
||||
|
||||
Reference in New Issue
Block a user