添加新版开放平台支付
This commit is contained in:
韩鹏辉
parent
7cabb2a109
commit
2c15439404
|
|
@ -359,4 +359,32 @@ public class LoginContoller {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* 重置资金密码
|
||||
* @param token
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("resetPwd")
|
||||
public Result resetPwd(@RequestHeader String token,@RequestBody Map<String, Object> map){
|
||||
|
||||
String userId = TokenUtil.parseParamFromToken(token).getString("userId");
|
||||
return loginService.resetPwd(userId,map);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改密码
|
||||
* @param token
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("mpdifyPwd")
|
||||
public Result mpdifyPwd(@RequestHeader String token,@RequestBody Map<String, Object> map){
|
||||
String userId = TokenUtil.parseParamFromToken(token).getString("userId");
|
||||
return loginService.modifyPwd(userId,map);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,16 @@ public class NotifyController {
|
|||
public String fstmemberInCallBack(HttpServletRequest request){
|
||||
Map<String, Object> map= getParameterMap(request);
|
||||
log.info("fstmemberInCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
|
||||
|
||||
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
|
||||
Map<String,Object> object=(Map)map.get("bizData");
|
||||
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
|
||||
if("TRADE_SUCCESS".equals(object.get("state").toString())){
|
||||
String orderNo=map.get("mchOrderNo").toString();
|
||||
String tradeNo=map.get("payOrderId").toString();
|
||||
return payService.fstMemberInSuccess(orderNo,tradeNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
|
|
@ -72,6 +81,26 @@ public class NotifyController {
|
|||
return null;
|
||||
}
|
||||
|
||||
|
||||
@RequestMapping("notifyfstCallBack")
|
||||
public String notifyfstCallBack(HttpServletRequest request){
|
||||
|
||||
Map<String, Object> map= getParameterMap(request);
|
||||
log.info("notifyfstCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
|
||||
if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
|
||||
Map<String,Object> object=(Map)map.get("bizData");
|
||||
if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
|
||||
if("TRADE_SUCCESS".equals(object.get("state").toString())){
|
||||
String orderNo=map.get("mchOrderNo").toString();
|
||||
String tradeNo=map.get("payOrderId").toString();
|
||||
return payService.callBackPayFST(tradeNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@RequestMapping("notifyCallBackGroup")
|
||||
public String notifyCallBackGroup(HttpServletRequest request){
|
||||
Map<String, Object> map= getParameterMap(request);
|
||||
|
|
|
|||
|
|
@ -272,6 +272,69 @@ public class LoginService {
|
|||
return Result.success(CodeEnum.SUCCESS);
|
||||
}
|
||||
|
||||
|
||||
public Result resetPwd(String userId,Map<String,Object> map){
|
||||
if(ObjectUtil.isNull(map)||ObjectUtil.isEmpty(map)||!map.containsKey("pwd")
|
||||
||ObjectUtil.isEmpty(map.get("pwd"))||!map.containsKey("code")
|
||||
||ObjectUtil.isEmpty(map.get("code"))||
|
||||
!map.containsKey("shopId")||ObjectUtil.isEmpty(map.get("shopId"))
|
||||
){
|
||||
return Result.fail("参数错误");
|
||||
}
|
||||
|
||||
TbUserInfo userInfo=tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
|
||||
boolean flag= validate(map.get("code").toString(), userInfo.getPhone());
|
||||
if(!flag){
|
||||
return Result.fail("验证码错误");
|
||||
}
|
||||
|
||||
|
||||
TbShopUser user=tbShopUserMapper.selectByUserIdAndShopId(userId,map.get("shopId").toString());
|
||||
if(ObjectUtil.isEmpty(user)||ObjectUtil.isNull(user)){
|
||||
return Result.fail("店铺用户信息不存在");
|
||||
}
|
||||
|
||||
|
||||
user.setIsPwd("1");
|
||||
user.setPwd(MD5Utils.md5(map.get("pwd").toString()));
|
||||
user.setUpdatedAt(System.currentTimeMillis());
|
||||
tbShopUserMapper.updateByPrimaryKey(user);
|
||||
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Result modifyPwd(String userId,Map<String,Object> map){
|
||||
if(ObjectUtil.isNull(map)||ObjectUtil.isEmpty(map)||!map.containsKey("pwd")
|
||||
||ObjectUtil.isEmpty(map.get("pwd"))||!map.containsKey("oldpwd")
|
||||
||ObjectUtil.isEmpty(map.get("oldpwd"))||
|
||||
!map.containsKey("shopId")||ObjectUtil.isEmpty(map.get("shopId"))
|
||||
){
|
||||
return Result.fail("参数错误");
|
||||
}
|
||||
|
||||
TbShopUser user=tbShopUserMapper.selectByUserIdAndShopId(userId,map.get("shopId").toString());
|
||||
if(ObjectUtil.isEmpty(user)||ObjectUtil.isNull(user)){
|
||||
return Result.fail("店铺用户信息不存在");
|
||||
}
|
||||
|
||||
if(!user.getPwd().equals(MD5Utils.md5(map.get("oldpwd").toString()))){
|
||||
return Result.fail("用户旧密码错误");
|
||||
}
|
||||
|
||||
|
||||
user.setIsPwd("1");
|
||||
user.setPwd(MD5Utils.md5(map.get("pwd").toString()));
|
||||
user.setUpdatedAt(System.currentTimeMillis());
|
||||
tbShopUserMapper.updateByPrimaryKey(user);
|
||||
|
||||
return Result.success(CodeEnum.SUCCESS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
for (int i = 0; i < 10; i++) {
|
||||
System.out.println(RandomUtil.randomNumbers(10));
|
||||
|
|
|
|||
|
|
@ -763,6 +763,47 @@ public class PayService {
|
|||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public String callBackPayFST(String payOrderNO) {
|
||||
TbOrderInfo orderInfo = tbOrderInfoMapper.selectByPayOrderNo(payOrderNO);
|
||||
if (ObjectUtil.isEmpty(orderInfo)) {
|
||||
return "订单信息不存在";
|
||||
}
|
||||
|
||||
if ("paying".equals(orderInfo.getStatus())) {
|
||||
int cartCount = tbCashierCartMapper.updateStatusByOrderId(orderInfo.getId().toString(), "final");
|
||||
|
||||
log.info("更新购物车:{}", cartCount);
|
||||
|
||||
//更新子单状态
|
||||
tbOrderDetailMapper.updateStatusByOrderIdAndStatus(orderInfo.getId(), "closed");
|
||||
|
||||
//修改主单状态
|
||||
orderInfo.setStatus("closed");
|
||||
orderInfo.setPayType("wx_lite");
|
||||
orderInfo.setPayOrderNo(payOrderNO);
|
||||
orderInfo.setPayAmount(orderInfo.getOrderAmount());
|
||||
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
|
||||
|
||||
|
||||
JSONObject jsonObject=new JSONObject();
|
||||
jsonObject.put("token",0);
|
||||
jsonObject.put("type","wxcreate");
|
||||
jsonObject.put("orderId",orderInfo.getId().toString());
|
||||
|
||||
producer.putOrderCollect(jsonObject.toJSONString());
|
||||
|
||||
log.info("发送打印数据");
|
||||
producer.printMechine(orderInfo.getId() + "");
|
||||
|
||||
return "SUCCESS";
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public String callBackGroupPay(String payOrderNO) {
|
||||
TbGroupOrderInfo orderInfo = tbGroupOrderInfoMapper.selectByPayOrderNo(payOrderNO);
|
||||
|
|
|
|||
Loading…
Reference in New Issue