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

yshop3.0正式发布

Browse Source
This commit is contained in:
hupeng
2020-07-14 16:05:21 +08:00
parent 27ceaf8969
commit ff162d34c0
28 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -132,7 +132,7 @@ public class AuthService {
//构建微信用户
WechatUserDto wechatUserDTO = WechatUserDto.builder()
.nickname(nickname)
.openid(wxMpUser.getOpenId())
.routineOpenid(wxMpUser.getOpenId())
.unionId(wxMpUser.getUnionId())
.sex(Integer.valueOf(wxMpUser.getGender()))
.language(wxMpUser.getLanguage())
@ -151,7 +151,7 @@ public class AuthService {
} else {
returnUser = yxUser;
WechatUserDto wechatUser =yxUser.getWxProfile();
if ((StrUtil.isBlank(wechatUser.getOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId()))
if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) {
wechatUser.setRoutineOpenid(wxMpUser.getOpenId());
wechatUser.setUnionId(wxMpUser.getUnionId());
@ -245,6 +245,8 @@ public class AuthService {
userService.setSpread(spread,returnUser.getUid());
log.error("spread:{}",spread);
return returnUser;
} catch (WxErrorException e) {

2
yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
View File

@ -191,6 +191,7 @@ public class OrderSupplyService {
jsConfig.put("package",wxPayMpOrderResult.getPackageValue());
jsConfig.put("signType",wxPayMpOrderResult.getSignType());
orderDTO.setJsConfig(jsConfig);
map.put("payMsg","订单创建成功");
map.put("result",orderDTO);
return map;
}else if(AppFromEnum.APP.getValue().equals(from)){//app支付
@ -206,6 +207,7 @@ public class OrderSupplyService {
jsConfig.put("sign",wxPayAppOrderResult.getSign());
orderDTO.setJsConfig(jsConfig);
map.put("result",orderDTO);
map.put("payMsg","订单创建成功");
return map;
}else{//公众号
map.put("status","WECHAT_PAY");

31
yshop-app/src/main/java/co/yixiang/modules/user/param/RechargeParam.java Normal file
View File

@ -0,0 +1,31 @@
package co.yixiang.modules.user.param;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @ClassName RechargeParam
* @Author hupeng <610796224@qq.com>
* @Date 2019/12/8
**/
@Data
public class RechargeParam implements Serializable {
@NotBlank(message = "充值参数有误")
@JsonProperty(value = "rechar_id")
private String recharId;
private String from;
//@NotNull(message = "金额必填")
// @Min(value = 1,message = "充值金额不能低于1")
private Double price;
@JsonProperty(value = "paid_price")
private Double paidPrice;
private String orderSn;
}

6
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java
View File

@ -190,15 +190,13 @@ public class UserController {
}
@AuthCheck
@PostMapping("/user/edit")
@ApiOperation(value = "用户修改信息",notes = "用修改信息")
public ApiResult<Object> edit(@Validated @RequestBody UserEditParam param){
int uid = SecurityUtils.getUserId().intValue();
YxUser yxUser = new YxUser();
YxUser yxUser = LocalUser.getUser();
yxUser.setAvatar(param.getAvatar());
yxUser.setNickname(param.getNickname());
yxUser.setUid(Long.valueOf(String.valueOf(uid)));
yxUserService.updateById(yxUser);

26
yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
View File

@ -9,6 +9,7 @@
package co.yixiang.modules.user.rest;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException;
import co.yixiang.common.bean.LocalUser;
@ -16,6 +17,7 @@ import co.yixiang.common.interceptor.AuthCheck;
import co.yixiang.constant.ShopConstants;
import co.yixiang.enums.AppFromEnum;
import co.yixiang.enums.BillDetailEnum;
import co.yixiang.exception.ErrorRequestException;
import co.yixiang.modules.shop.domain.YxSystemGroupData;
import co.yixiang.modules.shop.service.YxSystemGroupDataService;
import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria;
@ -26,6 +28,7 @@ import co.yixiang.modules.user.service.YxUserRechargeService;
import co.yixiang.mp.service.WeixinPayService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
import io.swagger.annotations.Api;
@ -108,6 +111,29 @@ public class UserRechargeController {
WxPayMwebOrderResult result = (WxPayMwebOrderResult)weixinPayService
.unifyPay(orderSn,param.getFrom(), BillDetailEnum.TYPE_1.getValue(),"H5充值");
map.put("data",result.getMwebUrl());
}else if(AppFromEnum.ROUNTINE.getValue().equals(param.getFrom())){
WxPayMpOrderResult wxPayMpOrderResult = (WxPayMpOrderResult)weixinPayService
.unifyPay(orderSn,param.getFrom(), BillDetailEnum.TYPE_1.getValue(),"小程序充值");
Map<String,String> jsConfig = new HashMap<>();
jsConfig.put("timeStamp",wxPayMpOrderResult.getTimeStamp());
jsConfig.put("appId",wxPayMpOrderResult.getAppId());
jsConfig.put("paySign",wxPayMpOrderResult.getPaySign());
jsConfig.put("nonceStr",wxPayMpOrderResult.getNonceStr());
jsConfig.put("package",wxPayMpOrderResult.getPackageValue());
jsConfig.put("signType",wxPayMpOrderResult.getSignType());
map.put("data",jsConfig);
}else if(AppFromEnum.APP.getValue().equals(param.getFrom())){
WxPayAppOrderResult wxPayAppOrderResult = (WxPayAppOrderResult)weixinPayService
.unifyPay(orderSn,param.getFrom(), BillDetailEnum.TYPE_1.getValue(),"app充值");
Map<String,String> jsConfig = new HashMap<>();
jsConfig.put("partnerid",wxPayAppOrderResult.getPartnerId());
jsConfig.put("appid",wxPayAppOrderResult.getAppId());
jsConfig.put("prepayid",wxPayAppOrderResult.getPrepayId());
jsConfig.put("package",wxPayAppOrderResult.getPackageValue());
jsConfig.put("noncestr",wxPayAppOrderResult.getNonceStr());
jsConfig.put("timestamp",wxPayAppOrderResult.getTimeStamp());
jsConfig.put("sign",wxPayAppOrderResult.getSign());
map.put("data",jsConfig);
}else{
WxPayMpOrderResult result = (WxPayMpOrderResult)weixinPayService
.unifyPay(orderSn,param.getFrom(), BillDetailEnum.TYPE_1.getValue(),"公众号充值");