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-22 18:09:01 +08:00
parent 2f84bed116
commit 75b451cdda
12 changed files with 135 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,8 @@ public class LoginService {
userInfo.setSourcePath("WECHAT-APP");
userInfo.setIsAttentionMp(Byte.parseByte("0"));
userInfo.setSearchWord("||微信用户");
userInfo.setIsPwd("0");
userInfo.setPwd(MD5Utils.md5("123456"));
userInfo.setLastLogInAt(System.currentTimeMillis());
userInfo.setCreatedAt(System.currentTimeMillis());
userInfo.setUpdatedAt(System.currentTimeMillis());
@@ -276,8 +278,7 @@ public class LoginService {
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"))
||ObjectUtil.isEmpty(map.get("code"))
){
return Result.fail("参数错误");
}
@@ -289,16 +290,10 @@ public class LoginService {
}
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);
userInfo.setIsPwd("1");
userInfo.setPwd(MD5Utils.md5(map.get("pwd").toString()));
userInfo.setUpdatedAt(System.currentTimeMillis());
tbUserInfoMapper.updateByPrimaryKey(userInfo);
return Result.success(CodeEnum.SUCCESS);
@@ -309,26 +304,25 @@ public class LoginService {
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"))
||ObjectUtil.isEmpty(map.get("oldpwd"))
){
return Result.fail("参数错误");
}
TbShopUser user=tbShopUserMapper.selectByUserIdAndShopId(userId,map.get("shopId").toString());
if(ObjectUtil.isEmpty(user)||ObjectUtil.isNull(user)){
return Result.fail("店铺用户信息不存在");
TbUserInfo userInfo=tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
if(ObjectUtil.isEmpty(userInfo)||ObjectUtil.isNull(userInfo)){
return Result.fail("用户基本信息不存在");
}
if(!user.getPwd().equals(MD5Utils.md5(map.get("oldpwd").toString()))){
if(!userInfo.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);
userInfo.setIsPwd("1");
userInfo.setPwd(MD5Utils.md5(map.get("pwd").toString()));
userInfo.setUpdatedAt(System.currentTimeMillis());
tbUserInfoMapper.updateByPrimaryKey(userInfo);
return Result.success(CodeEnum.SUCCESS);

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

@@ -125,6 +125,9 @@ public class PayService {
@Autowired
ThirdPayService thirdPayService;
@Autowired
TbUserInfoMapper tbUserInfoMapper;
@Resource
@@ -715,11 +718,15 @@ public class PayService {
@Transactional(rollbackFor = Exception.class)
public Result memberIn(String openId,String userId,String amount,String shopId,String ip){
public Result memberIn(String openId,String userId,String amount,String shopId,String ip) throws JsonProcessingException {
if(ObjectUtil.isEmpty(openId)||ObjectUtil.isEmpty(userId)){
return Result.fail("用户信息允许为空");
}
TbUserInfo userInfo= tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));
if(ObjectUtil.isEmpty(userInfo)){
return Result.fail("用户基本信息不存在");
}
TbShopUser tbShopUser= tbShopUserMapper.selectByUserIdAndShopId(userId,shopId);
if(ObjectUtil.isEmpty(tbShopUser)){
@@ -727,7 +734,7 @@ public class PayService {
}
if("0".equals(tbShopUser.getIsPwd())){
if("0".equals(userInfo.getIsPwd())){
return Result.fail("用户支付密码未设置");
}
@@ -789,18 +796,19 @@ public class PayService {
}
}
}else {
PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),userId,ip, DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callInBack,null,thirdApply.getAppToken());
String orderNo=DateUtils.getsdfTimesSS();
PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),openId,ip, orderNo,thirdApply.getStoreId(),callInBack,null,thirdApply.getAppToken());
if(ObjectUtil.isNotNull(publicResp)&&ObjectUtil.isNotEmpty(publicResp)){
if("000000".equals(publicResp.getCode())){
WxScanPayResp wxScanPayResp= publicResp.getObjData();
if("TRADE_SUCCESS".equals(wxScanPayResp.getState())){
if("TRADE_AWAIT".equals(wxScanPayResp.getState())){
memberIn.setOrderNo(wxScanPayResp.getPayOrderId());
memberIn.setOrderNo(orderNo);
memberIn.setTradeNo(wxScanPayResp.getPayOrderId());
memberIn.setUpdateTime(new Date());
tbMemberInMapper.updateByPrimaryKeySelective(memberIn);
return Result.success(CodeEnum.SUCCESS,wxScanPayResp.getPayInfo());
ObjectMapper mapper = new ObjectMapper();
return Result.success(CodeEnum.SUCCESS,mapper.readTree(wxScanPayResp.getPayInfo()));
}else{
return Result.fail(publicResp.getMsg());
@@ -936,6 +944,15 @@ public class PayService {
public Result getShopByMember(String userId,String shopId,int page,int pageSize){
PageHelper.startPage(page, pageSize);
List<Map<String,Object>> list= tbShopUserMapper.selectByUserId(userId,shopId);
PageInfo pageInfo=new PageInfo(list);
return Result.success(CodeEnum.SUCCESS,pageInfo);
}
/**
@@ -1040,6 +1057,10 @@ public class PayService {
return "充值记录不存在";
}
if(!"7".equals(memberIn.getStatus())){
return "订单已处理";
}
memberIn.setTradeNo(tradeNo);
memberIn.setStatus("0");
memberIn.setUpdateTime(new Date());
@@ -1051,6 +1072,7 @@ public class PayService {
}
if(!"1".equals(tbShopUser.getIsVip().toString())){
tbShopUser.setCode(DateUtils.getsdfTimesSS());
tbShopUser.setIsVip(Byte.parseByte("1"));
}

2
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -83,8 +83,6 @@ public class ProductService {
tbShopUser.setShopId(shopId);
tbShopUser.setUserId(userId);
tbShopUser.setMiniOpenId(openId);
tbShopUser.setPwd(MD5Util.encrypt("123456"));
tbShopUser.setIsPwd("0");
tbShopUser.setCreatedAt(System.currentTimeMillis());
tbShopUser.setUpdatedAt(System.currentTimeMillis());
tbShopUserMapper.insert(tbShopUser);