+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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/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/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