cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加充值功能

Browse Source
This commit is contained in:
hupeng
2020-03-01 19:57:48 +08:00
parent a2e56fe072
commit 3afc837079
4 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-api/src/main/java/co/yixiang/modules/activity/web/dto/StoreSeckillDTO.java
View File

@ -22,7 +22,7 @@ public class StoreSeckillDTO implements Serializable {
private YxStoreProductReplyQueryVo reply;
private Integer replyCount = 0;
private Integer replyCount;
private YxStoreSeckillQueryVo storeInfo;

17
yshop-api/src/main/java/co/yixiang/modules/order/service/YxPayService.java
View File

@ -37,7 +37,7 @@ public class YxPayService {
* @throws WxPayException
*/
public WxPayMpOrderResult wxPay(String orderId, String openId, String body,
Integer totalFee) throws WxPayException {
Integer totalFee,int type) throws WxPayException {
String apiUrl = systemConfigService.getData("api_url");
if (StrUtil.isBlank(apiUrl)) throw new ErrorRequestException("请配置api地址");
@ -51,7 +51,11 @@ public class YxPayService {
orderRequest.setOutTradeNo(orderId);
orderRequest.setTotalFee(totalFee);
orderRequest.setSpbillCreateIp("127.0.0.1");
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/notify");
if(type == 2){
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/renotify");
}else{
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/notify");
}
WxPayMpOrderResult orderResult = wxPayService.createOrder(orderRequest);
@ -73,7 +77,7 @@ public class YxPayService {
* @throws WxPayException
*/
public WxPayMwebOrderResult wxH5Pay(String orderId, String body,
Integer totalFee) throws WxPayException {
Integer totalFee,int type) throws WxPayException {
String apiUrl = systemConfigService.getData("api_url");
if (StrUtil.isBlank(apiUrl)) throw new ErrorRequestException("请配置api地址");
@ -86,8 +90,11 @@ public class YxPayService {
orderRequest.setOutTradeNo(orderId);
orderRequest.setTotalFee(totalFee);
orderRequest.setSpbillCreateIp("127.0.0.1");
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/notify");
if(type == 2){
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/renotify");
}else{
orderRequest.setNotifyUrl(apiUrl + "/api/wechat/notify");
}
WxPayMwebOrderResult orderResult = wxPayService.createOrder(orderRequest);

6
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -1049,7 +1049,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
BigDecimal bigDecimal = new BigDecimal(100);
return payService.wxH5Pay(orderId,"H5商品购买",
bigDecimal.multiply(orderInfo.getPayPrice()).intValue());
bigDecimal.multiply(orderInfo.getPayPrice()).intValue(),1);
}
@ -1077,7 +1077,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
BigDecimal bigDecimal = new BigDecimal(100);
return payService.wxPay(orderId,wechatUser.getRoutineOpenid(),"小程序商品购买",
bigDecimal.multiply(orderInfo.getPayPrice()).intValue());
bigDecimal.multiply(orderInfo.getPayPrice()).intValue(),1);
}
@ -1101,7 +1101,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
BigDecimal bigDecimal = new BigDecimal(100);
return payService.wxPay(orderId,wechatUser.getOpenid(),"公众号商品购买",
bigDecimal.multiply(orderInfo.getPayPrice()).intValue());
bigDecimal.multiply(orderInfo.getPayPrice()).intValue(),1);
}

53
yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserRechargeController.java
View File

@ -8,11 +8,25 @@
*/
package co.yixiang.modules.user.web.controller;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.common.api.ApiResult;
import co.yixiang.common.web.controller.BaseController;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.order.service.YxPayService;
import co.yixiang.modules.shop.service.YxSystemConfigService;
import co.yixiang.modules.user.entity.YxUser;
import co.yixiang.modules.user.entity.YxWechatUser;
import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.modules.user.service.YxUserService;
import co.yixiang.modules.user.service.YxWechatUserService;
import co.yixiang.modules.user.web.param.RechargeParam;
import co.yixiang.utils.SecurityUtils;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -23,6 +37,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@ -41,6 +57,9 @@ import java.util.Map;
public class UserRechargeController extends BaseController {
private final YxUserRechargeService userRechargeService;
private final YxSystemConfigService systemConfigService;
private final YxPayService payService;
private final YxWechatUserService wechatUserService;
/**
* 公众号充值/H5充值
@ -49,9 +68,41 @@ public class UserRechargeController extends BaseController {
@ApiOperation(value = "公众号充值/H5充值",notes = "公众号充值/H5充值",response = ApiResult.class)
public ApiResult<Map<String,Object>> add(@Valid @RequestBody RechargeParam param){
int uid = SecurityUtils.getUserId().intValue();
String money = systemConfigService.getData("store_user_min_recharge");
Double newMoney = 0d;
if(StrUtil.isNotEmpty(money)) newMoney = Double.valueOf(money);
if(newMoney > param.getPrice()) throw new ErrorRequestException("充值金额不能低于"+newMoney);
Map<String,Object> map = new LinkedHashMap<>();
map.put("id",null);
map.put("type",param.getFrom());
//生成分布式唯一值
String orderSn = IdUtil.getSnowflake(0,0).nextIdStr();
BigDecimal bigDecimal = new BigDecimal(100);
int price = bigDecimal.multiply(BigDecimal.valueOf(param.getPrice())).intValue();
try{
if(param.getFrom().equals("weixinh5")){
WxPayMwebOrderResult result = payService.wxH5Pay(orderSn,"H5充值", price,2);
map.put("data",result.getMwebUrl());
}else{
YxWechatUser wechatUser = wechatUserService.getById(uid);
if(ObjectUtil.isNull(wechatUser)) throw new ErrorRequestException("用户错误");
WxPayMpOrderResult result = payService.wxPay(orderSn,wechatUser.getOpenid(),
"H5充值", price,2);
Map<String,String> jsConfig = new HashMap<>();
jsConfig.put("appId",result.getAppId());
jsConfig.put("timeStamp",result.getTimeStamp());
jsConfig.put("nonceStr",result.getNonceStr());
jsConfig.put("package",result.getPackageValue());
jsConfig.put("signType",result.getSignType());
jsConfig.put("paySign",result.getPaySign());
map.put("data",jsConfig);
}
}catch (WxPayException e){
return ApiResult.fail(e.getMessage());
}
return ApiResult.ok(map);
}