czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加新版开放平台支付

Browse Source
This commit is contained in:
韩鹏辉
2024-05-20 16:28:54 +08:00
parent 7cabb2a109
commit 2c15439404
4 changed files with 162 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
View File

@@ -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));

41
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -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);