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

Merge branch 'master' of https://gitee.com/nny_1/oilSystem

Browse Source
This commit is contained in:
wangh 2023-11-29 17:19:38 +08:00
commit dd5df3bc78
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/views/member/index.vue
View File

@ -309,7 +309,6 @@
<el-select <el-select
v-model="form.gradeId" v-model="form.gradeId"
placeholder="会员等级" placeholder="会员等级"
:disabled="form.gradeId==''"
style="width: 300px" style="width: 300px"
> >
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/> <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml
View File

@ -111,8 +111,8 @@
<!--新增所有列--> <!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true"> <insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into mt_invitation(userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by) insert into mt_invitation(userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by,chain_store_id)
values (#{userid}, #{storeid}, #{staffid}, #{inviterid}, #{status}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}) values (#{userid}, #{storeid}, #{staffid}, #{inviterid}, #{status}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}),#{chainStoreId}
</insert> </insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -13,7 +13,9 @@ import com.fuint.business.userManager.entity.MtInvitation;
import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.mapper.CertifiedMemberMapper; import com.fuint.business.userManager.mapper.CertifiedMemberMapper;
import com.fuint.business.userManager.mapper.LJUserMapper; import com.fuint.business.userManager.mapper.LJUserMapper;
import com.fuint.business.userManager.mapper.MtInvitationMapper;
import com.fuint.business.userManager.service.LJUserService; import com.fuint.business.userManager.service.LJUserService;
import com.fuint.business.userManager.service.MtInvitationService;
import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.business.userManager.service.UserBalanceService;
import com.fuint.business.userManager.vo.LJUserVo; import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
@ -150,6 +152,8 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
@Autowired @Autowired
private ILJStoreService storeService; private ILJStoreService storeService;
@Autowired
private MtInvitationMapper invitationMapper;
/** /**
* 添加会员信息 * 添加会员信息
@ -227,6 +231,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
invitation.setStoreId(storeId); invitation.setStoreId(storeId);
invitation.setStaffid(nowAccountInfo.getStaffId()); invitation.setStaffid(nowAccountInfo.getStaffId());
invitation.setChainStoreId(chainStoreId); invitation.setChainStoreId(chainStoreId);
invitationMapper.insert(invitation);
return row; return row;
} }