diff --git a/fuintAdmin/src/api/staff/store.js b/fuintAdmin/src/api/staff/store.js index d0b3df836..828980eeb 100644 --- a/fuintAdmin/src/api/staff/store.js +++ b/fuintAdmin/src/api/staff/store.js @@ -8,7 +8,7 @@ export function ljStoreInfo() { }) } -// 查询店铺详细 +// 查询所有店铺信息 export function ljStoreList() { return request({ url: '/business/storeInformation/store/list', @@ -16,6 +16,14 @@ export function ljStoreList() { }) } +// 根据连锁店id查询店铺信息 +export function storesList() { + return request({ + url: '/business/storeInformation/store/stores', + method: 'get' + }) +} + // 修改店铺信息 export function updateStore(data) { return request({ diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 730d611c2..ddedee9b9 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -709,6 +709,7 @@ export default { this.pddhidlist.push(row.id) console.log(row) let data ={ + giftUserType:0,//邀请人获得 activeGift: 2, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物 goodsIds: "", //商品id goodsName:"" , //商品名称 @@ -908,6 +909,7 @@ export default { console.log(this.ruleForm.activeRecommendChildList) console.log(this.ruleForm) this.ruleForm.id = 1 + this.$refs["ruleForm"].validate(valid => { if (valid) { if (this.ruleForm.id != null) { diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 878fc6ca8..c1f68ee49 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -311,7 +311,7 @@ placeholder="会员等级" style="width: 300px" > - + @@ -334,7 +334,7 @@ - + @@ -348,7 +348,7 @@ - + @@ -390,7 +390,7 @@ - +
第一步: 下载示例模板,按照模板填写会员数据,手机号为必填项
{ this.userGradeList = response.data.records; }); - ljStoreList().then( response => { + storesList().then( response => { this.storeList = response.data }); }, diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index f6d846ac9..e15ce2e91 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -25,14 +25,16 @@ {{form.mobile}} 更换 - {{form.name}} - {{form.idcard}} - + + {{form.name ? form.name : "--"}} + + {{form.idcard ? form.idcard : "--"}} + -- {{form.consumeNum}} - {{form.refuelMoney}} + {{form.refuelMoney ? form.refuelMoney : "--"}} {{ store.name }} {{form.createTime}} @@ -41,7 +43,7 @@ {{ grade.name }} - + -- 跟随全局总配置 @@ -49,7 +51,7 @@ - {{ form.description }} + {{ form.description ? form.description : "--" }}
@@ -65,7 +67,7 @@
@@ -74,8 +76,8 @@
+ :value="form.growthValue" + title="成长值">
@@ -84,7 +86,7 @@ @@ -94,9 +96,11 @@ + :value="form.refuelMoney" + title="囤油卡余额" + > + + @@ -511,12 +515,14 @@ + +
确 定 - 取 消 + 取 消 +
+ + + + + + + + + + + + + +
+ 确 定 + 取 消
@@ -656,7 +679,7 @@
确 定 - 取 消 + 取 消
@@ -771,7 +794,7 @@
确 定 - 取 消 + 取 消
@@ -799,7 +822,7 @@
确 定 - 取 消 + 取 消
@@ -873,14 +896,12 @@ export default { realyPayBills:0, - oilTypeList: {}, isPay:true, isPaySuccess:false, isQuery:true, - payList:[], // 升数卡 literCard:[ @@ -907,6 +928,7 @@ export default { title:'', // 是否显示修改对话框 openMobile: false, + openName: false, openRecharge: false, openSecondCard:false, openBindIdCard:false, @@ -949,6 +971,7 @@ export default { // 表单校验 rules: { mobile: [{ required: true, message: "请输入手机号", trigger: "blur" }], + name: [{ required: true, message: "请输入会员昵称，内容不可为空", trigger: "blur" }], type: [{ required: true, message: "请选择操作类型", trigger: "blur" }], fixingLevel: [{ required: true, message: "请选择认证信息", trigger: "blur" }], } @@ -974,6 +997,11 @@ export default { this.openMobile = true; this.title = '更换手机号' }, + // 更换会员昵称 + changeName(){ + this.openName = true; + this.title = '会员昵称' + }, // 副卡管理 secondCard(){ this.openSecondCard = true; @@ -1162,7 +1190,6 @@ export default { confirm(flag){ this.flag = flag - if (flag ===1) { if (this.cardValueForm.paymentType == '') { this.$message.error('请选择支付方式'); @@ -1452,6 +1479,7 @@ export default { updateUser(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.openMobile = false; + this.openName = false; this.openConfig = false; this.openLevel = false; this.openBindIdCard = false; @@ -1468,10 +1496,6 @@ export default { }, // 取消按钮 cancel() { - this.openMobile = false; - this.openConfig = false; - this.openLevel = false; - this.openBindIdCard = false; this.openRecharge = false; this.isPay = true; diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue new file mode 100644 index 000000000..0d5239c79 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties index 806dacbc7..97c6f9406 100644 --- a/fuintBackend/configure/dev/application.properties +++ b/fuintBackend/configure/dev/application.properties @@ -87,8 +87,8 @@ weixin.official.appId=wxf4327ef05c27a0 weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3 # 小程序配置 -wxpay.appId = wxb6af3741234162bc -wxpay.appSecret = 76a538bfa5b55a4564d5f2be5540 +wxpay.appId = wxba517a9bac38fe92 +wxpay.appSecret = 8bfcce86abc4e2a461ecc781a09249a5 wxpay.mchId=1636980812 wxpay.apiV2=34354320201030y323e432342343 wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java index e005561ad..4b9ef0d0a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java @@ -64,7 +64,7 @@ public class IntegralSettingsController extends BaseController { */ @GetMapping("getByStoreId") public ResponseObject getByStoreId(Integer id) { - return getSuccessResult(this.integralSettingsService.queryById(id)); + return getSuccessResult(this.integralSettingsService.getByStoreId(id)); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 1b382edc1..817f8fa50 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -52,7 +52,8 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { @Override public IntegralSettings getByStoreId(Integer id) { - return this.integralSettingsMapper.getByStoreId(id); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return this.integralSettingsMapper.getByStoreId(nowAccountInfo.getStoreId()); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 6bbf91801..0fdfca8ce 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -451,6 +451,9 @@ public class OilOrderServiceImpl extends ServiceImpl i Double beforeBalance = balance.getCardBalance(); Double afterBalance = beforeBalance - amount; balance.setCardBalance(afterBalance); +// 修改加油次数 + Integer consumeNum = balance.getConsumeNum(); + balance.setConsumeNum(consumeNum+1); userBalanceService.updateUserBalance(balance); // 添加余额记录信息 CardBalanceChange cardBalanceChange = new CardBalanceChange(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java index 011f4f91a..b33e6b82c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java @@ -51,6 +51,16 @@ public class OilNumberController extends BaseController { return getSuccessResult(list); } + @ApiOperation("查询所有油号") + @GetMapping("getList2") + public ResponseObject selectAll2(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10000") Integer pageSize, + OilNumber oilNumber) { + Page page =new Page(pageNo,pageSize); + IPage list = oilPresetPricesService.selectOilNumberList2(page,oilNumber); + return getSuccessResult(list); + } + /** * 通过主键查询单条数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNumberMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNumberMapper.java index dd8e2052d..109ea58ba 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNumberMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilNumberMapper.java @@ -23,6 +23,7 @@ public interface OilNumberMapper extends BaseMapper { * @return */ IPage selectOilNumberList(Page page, @Param("oilNumber") OilNumber oilNumber); + IPage selectOilNumberList2(Page page, @Param("oilNumber") OilNumber oilNumber); /** * 根据id查询员工信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml index bf03818a6..a9b514352 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml @@ -31,6 +31,19 @@ where store_id = #{oilNumber.storeId} + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNumberService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNumberService.java index c14472682..0fe3bd5e8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNumberService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilNumberService.java @@ -23,6 +23,7 @@ public interface OilNumberService extends IService { * @return */ public IPage selectOilNumberList(Page page, @Param("oilNumber") OilNumber oilNumber); + public IPage selectOilNumberList2(Page page, @Param("oilNumber") OilNumber oilNumber); /** * 根据id查询员工信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java index a368198c7..e1096cd8b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilNumberServiceImpl.java @@ -33,6 +33,13 @@ public class OilNumberServiceImpl extends ServiceImpl selectOilNumberList2(Page page, OilNumber oilNumber) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + oilNumber.setStoreId(nowAccountInfo.getStoreId()); + return baseMapper.selectOilNumberList2(page,oilNumber); + } + @Override public OilNumber selectOilNumberById(int id) { return baseMapper.selectOilNumberById(id); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java index d24ab0113..aef38724b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java @@ -38,6 +38,16 @@ public class LJStoreController extends BaseController { return getSuccessResult(list); } + /** + * 根据连锁店id查询所有门店信息 + * @return + */ + @GetMapping("/stores") + public ResponseObject stores(){ + List list = storeService.selectStoreByChainStoreId(); + return getSuccessResult(list); + } + /** * 修改门店信息 * @param store diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java index 23a6d80aa..6d6e4ab80 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java @@ -41,6 +41,12 @@ public interface ILJStoreService extends IService { */ public List selectStoreList(); + /** + * 根据连锁店id查询店铺信息 + * @return + */ + public List selectStoreByChainStoreId(); + /** * 修改店铺信息 * @param store 店铺信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java index 58ddbaccb..d8be6e2d0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java @@ -1,5 +1,6 @@ package com.fuint.business.storeInformation.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.storeInformation.entity.LJStore; import com.fuint.business.storeInformation.mapper.LJStoreMapper; @@ -7,6 +8,7 @@ import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.StringUtils; import com.fuint.common.util.TokenUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -123,6 +125,17 @@ public class LJStoreServiceImpl extends ServiceImpl impl return baseMapper.selectList(null); } + @Override + public List selectStoreByChainStoreId() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = this.selectStoreByStoreId(nowAccountInfo.getStoreId()); + Integer chainStoreId = store.getChainStoreId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("chain_store_id",chainStoreId); + List list = baseMapper.selectList(queryWrapper); + return list; + } + /** * 修改店铺信息 * @param store 店铺信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java index a2e31f0fd..3147dee95 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java @@ -44,11 +44,11 @@ public interface LJUserMapper extends BaseMapper { /** * 统计信息 - * @param storeId + * @param chainStoreId * @param sumValue * @return */ - public Double selectSumByStore(@Param("storeId") int storeId,@Param("sumValue") String sumValue); + public Double selectSumByStore(@Param("chainStoreId") int chainStoreId,@Param("sumValue") String sumValue); LJUserVo selectAllInfoById(@Param("userId") Integer userId); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index 03b0a2845..41f7d9d9f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -2,20 +2,23 @@ - select mu.*,mub.card_balance,mub.points,mub.growth_value,mub.refuel_money,mub.grade_id,mub.consume_num, - mub.second_card,mub.fixing_level - from mt_user mu - left join mt_user_balance mub on mu.id = mub.mt_user_id + select mu.*,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.second_card,mub.fixing_level, + mi.storeId,mi.staffId,mi.inviterId,mi.chain_store_id from mt_user mu + left join mt_user_balance mub on mu.id = mub.mt_user_id + left join mt_invitation mi on mu.id = mi.userId