dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-02-20 13:33:34 +08:00
parent 26555b9dbc
commit 857f954c2c
9 changed files with 64 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/GrowthValueChangeServiceImpl.java
View File

@ -39,7 +39,23 @@ public class GrowthValueChangeServiceImpl extends ServiceImpl<GrowthValueChangeM
@Override
public int insertGrowthValueChange(GrowthValueChange growthValueChange) {
return baseMapper.insert(growthValueChange);
int row = 0;
// 根据订单号和成长值变化状态搜索成长值记录信息
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_no",growthValueChange.getOrderNo());
queryWrapper.eq("change_type","1");
queryWrapper.eq("user_id",growthValueChange.getUserId());
queryWrapper.eq("store_id",growthValueChange.getStoreId());
GrowthValueChange growthValueChange1 = baseMapper.selectOne(queryWrapper);
if (ObjectUtil.isNotEmpty(growthValueChange1)){
Integer growthValue = growthValueChange1.getGrowthValue();
growthValueChange1.setGrowthValue(growthValue+growthValueChange.getGrowthValue());
growthValueChange1.setAfterTheChange(growthValueChange.getAfterTheChange());
row = baseMapper.updateById(growthValueChange1);
}else {
row = baseMapper.insert(growthValueChange);
}
return row;
}
@Override
@ -66,7 +82,7 @@ public class GrowthValueChangeServiceImpl extends ServiceImpl<GrowthValueChangeM
growthValueChange1.setChangeType("0");
growthValueChange1.setGrowthValue(-growthValueChange.getGrowthValue());
growthValueChange1.setAfterTheChange(growthValueChange.getAfterTheChange()-growthValueChange.getGrowthValue());
growthValueChange1.setOrderNo(orderNo);
growthValueChange1.setOrderNo(orderNo+"-ref");
LJUserVo userVo = userService.selectUserById(userId, storeId);
if (ObjectUtil.isNotEmpty(userVo)){
this.insertGrowthValueChange(growthValueChange1);

16
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java
View File

@ -759,12 +759,15 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
log.info("--MemberServiceImpl:登陆时open_id--{}",openId);
if (ObjectUtil.isNotEmpty(mobile) || "".equals(mobile)) {
// 根绝手机号查询是否有该用户 没有则新建 有就更新
// 根据openid查询是否有该用户 有则查看是否和手机号id一致，一致则更新，不一致则删除openid查询出来的用户信息 更新手机号查询出来的用户信息
LJUser user = ljUserService.selectUserByOpenId(openId);
// 根绝手机号查询是否有该用户 没有则新建 有就更新
MtUser mtUserMobile = queryMemberByMobile2(mobile);
MtUser mtUser = new MtUser();
if (ObjectUtil.isEmpty(mtUserMobile)) {
//
// 新增
// LJUserVo userVo = new LJUserVo();
mtUser.setOpenId(openId);
@ -784,7 +787,11 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
gender = GenderEnum.FEMALE.getKey().toString();
}
save(mtUser);
if (ObjectUtil.isEmpty(user)) {
save(mtUser);
}else {
baseMapper.updateById(mtUser);
}
// 新增余额信息
if (ObjectUtil.isNotEmpty(storeId) && storeId !="") {
@ -809,6 +816,11 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
// boolean b = ljUserService.updateById(ljUser);
if (ObjectUtil.isNotEmpty(user)){
if (mtUserMobile.getId()!=user.getId()){
ljUserService.deleteUserById(user.getId());
}
}
int i = baseMapper.updateById(mtUserMobile);

2
fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java
View File

@ -61,7 +61,7 @@ public class ShiroConfig {
filterMap.put("/business/petrolStationManagement/oilNumber/getList2","anon"); // 主页油号获取
filterMap.put("/business/petrolStationManagement/oilGun/selectByNumber/**","anon"); // 获取油站的油号
filterMap.put("/business/member/staff/queryStaffList/**","anon"); // 获取员工信息
filterMap.put("/business/indexBanner/list/**","anon"); // 获取员工信息
filterMap.put("/business/indexBanner/list/**","anon"); // 获取小程序首页轮播图
filterMap.put("/business/storeInformation/store/queryStores","anon"); // 切换站点
filterMap.put("/business/handoverRecord/downloadFile","anon"); // 切换站点
filterMap.put("/business/petrolStationManagement/oilGun/queryGunList/**","anon"); // 获取油枪列表信息

16
fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java
View File

@ -192,7 +192,21 @@ public class ClientSignController extends BaseController {
return getSuccessResult(true);
}
if ((Boolean) param.get("isRefuel") == true){
if (ObjectUtil.isNotEmpty(param.get("isRefuel")) && (Boolean) param.get("isRefuel") == true){
LJUser user = ljUserService.selectUserByOpenId(loginInfo.get("openid").toString());
if (ObjectUtil.isEmpty(user)){
LJUser ljUser = new LJUser();
ljUser.setOpenId(loginInfo.get("openid").toString());
ljUserService.addUser(ljUser);
}
LJUser user1 = ljUserService.selectUserByOpenId(loginInfo.get("openid").toString());
// 将用户id存入token
AccountInfo accountInfo = new AccountInfo();
// String userAgent = request.getHeader("user-agent");
// String token = TokenUtil.generateToken(userAgent, user1.getId());
// accountInfo.setToken(token);
accountInfo.setId(user1.getId());
TokenUtil.saveAccountToken(accountInfo);
return getSuccessResult(true);
}

4
gasStation-uni/pages/refuel/refuel.vue
View File

@ -585,6 +585,10 @@
}
})
}
if (uni.getStorageSync("appltType")== "WECHAT") {
}
},
// 退格键被点击
backspace() {

2
gasStation-uni/pagesLogin/login/login.vue
View File

@ -87,7 +87,7 @@
authCode: authCode,
storeId: uni.getStorageSync("storeId"),
staffId: "",
phone: "18457621459",
// phone: "18457621459",Z
encryptedData: encryptedData,
},
}).then((resp) => {

5
gasStation-uni/pagesMy/details/details.vue
View File

@ -56,7 +56,7 @@
<view class="hui-size">囤油卡付款升数</view>
<view class="">{{ oilOrder.oilCardAmount }}元</view>
</view>
<view class="box-title" v-if="AppToken">优惠信息</view>
<view class="box-title" v-if="AppToken && oilOrder.discountAmount>0">优惠信息</view>
<view class="dis-fx" v-if="AppToken && oilOrder.activeId && oilOrder.activeType=='1'">
<view class="hui-size">满减活动优惠</view>
<view class="">{{fullOrDiscount.deductionAmount || oilOrder.discountAmount}}元</view>
@ -117,6 +117,9 @@
this.orderNo = e.orderNo
this.getOilOrder()
},
onShow() {
this.getOilOrder()
},
components: {
},

7
gasStation-uni/pagesMy/myorder/myorder.vue
View File

@ -65,6 +65,11 @@
<text>去评价</text>
</view>
</view>
<view v-if="item.orderStatus=='paid' && item.remark!='' && item.remark!=null" class="end-box">
<view>
<text>已评价</text>
</view>
</view>
<view v-else-if="item.orderStatus=='unpaid'" class="end-box" @click="goPayment(item.orderNo)">
<view class="anniu">
<text>去支付</text>
@ -177,7 +182,7 @@
// this.getPayList()
},
onShow() {
// this.getTapIndex(0)
this.getTapIndex(0)
},
components: {

2
gasStation-uni/utils/request.js
View File

@ -39,7 +39,7 @@ const request = config => {
// debugger
let res = response
console.log(res);
console.log(res,config.url);
const code = res.data.code || 200
const msg = errorCode[code] || res.data.msg || errorCode['default']
if (code === 401) {