From c54811e52a045f43318171f13de122595b51d308 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 27 Jul 2024 11:58:41 +0800 Subject: [PATCH] bug --- fuintAdmin_zt/src/assets/images/danxuan_c.png | Bin 0 -> 387 bytes fuintAdmin_zt/src/assets/images/danxuan_h.png | Bin 0 -> 394 bytes .../src/views/components/Service/payment.vue | 21 +- .../src/views/components/Service/staff.vue | 1110 +++++++++-------- .../impl/PaymentRuleConfigServiceImpl.java | 7 + .../fuint/business/member/entity/LJStaff.java | 3 + .../service/impl/LJStaffServiceImpl.java | 6 +- .../controller/BackendStoreController.java | 4 + .../business/store/service/StoreService.java | 2 + .../store/service/impl/StoreServiceImpl.java | 8 + 10 files changed, 653 insertions(+), 508 deletions(-) create mode 100644 fuintAdmin_zt/src/assets/images/danxuan_c.png create mode 100644 fuintAdmin_zt/src/assets/images/danxuan_h.png diff --git a/fuintAdmin_zt/src/assets/images/danxuan_c.png b/fuintAdmin_zt/src/assets/images/danxuan_c.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd7993eb15f0409137f6f105695171e16ea8635 GIT binary patch literal 387 zcmV-}0et?6P)Px$JxN4CR5(w)lrc*KK@f$%ImI-&-ywp9g|(ois71J7qp{CfiDIExh!zsD^3oe^ zR&a*?RYzd2im1VEKq;9>WD{usi`t0b$%IQC`8R zi+}m@ld`@Y>d}%*e(V&H6~M_nPEfrdZm!GrRU-@T0UDT_djO_DZ_wm~_~X$$%#ThZ z&IZT=@I>Q%CJXHa2HqJWC6rz9!^3{kG$`&M9H3egKUz!Q=>i(hBzXqCm2$NBTLQG| zU4zV{&Scut46t4Kb58vFy_rMH&piW=oBM5v8Wd)ck-MytZeX=o16EO7@x#~v1FwR} zW^2lNEPk}rDdgtffO9E_rM8;CfmN>pg91Bd+mdX1DBqshi%rUGd%;dc#m?7DhuPY4 h_|J|U?mir((=QI`#uWr{br=8u002ovPDHLkV1oUFskQ(B literal 0 HcmV?d00001 diff --git a/fuintAdmin_zt/src/assets/images/danxuan_h.png b/fuintAdmin_zt/src/assets/images/danxuan_h.png new file mode 100644 index 0000000000000000000000000000000000000000..a8deb613b1759bad1b6a1a26ad63fdb14a099ffd GIT binary patch literal 394 zcmV;50d@X~P)Px$L`g(JR5(w)ls`+wFcihl4b52Sw-CX>!CBBzbaD32P)Y*NNpw;iM2Dg{Ii!>h zKAl|@M+IjG2SNN6McrC@C65;R`koFNU#2_c{*rTYatV$XIp$%qz%)&#tEyTBFjXsg z6GB`^QS|zqvavVJvdk}v;+%-q0EkX=#mrYy%B?UAKf2%%poNuX`3PW^nQw{cEYI^N z+ZY7F95Zhd(K3K%&-3QH&=H_9=7NYe0PHKJj>kz$l4K9S5i|F-)|>4;L%`az7iPZG zTCe<+0AtJz5iJQJX4;+(0h^NnEGnfQEU@xXt4erI569pWap1kd*&`S&8s>Mb}K4w ozFs@b&W6KZX5?h&;cssG1q(0U6=Eur-~a#s07*qoM6N<$f}6LflmGw# literal 0 HcmV?d00001 diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index ab1dc45ee..ac6597978 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -131,9 +131,9 @@ label="规则名称" align="center" width="120"> - - - + + + - +
按比例分账 @@ -274,7 +274,7 @@ @@ -300,7 +300,7 @@ @@ -344,9 +344,9 @@ style="width: 100%;">
- - - + + +
启用成功后其他规则的规则状态变为停用！
@@ -724,6 +724,9 @@ export default { ruleName: [ {required: true, message: '请输入规则名称', trigger: 'blur'}, ], + ruleType: [ + {required: true, message: '请选择规则类型', trigger: 'blur'}, + ], } } }, diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue index 745503c5a..7fb12c512 100644 --- a/fuintAdmin_zt/src/views/components/Service/staff.vue +++ b/fuintAdmin_zt/src/views/components/Service/staff.vue @@ -1,53 +1,59 @@ @@ -107,103 +115,92 @@ - - - - - + + + + + - - - + + + - - - + + + + + + + + + + + - - - - - + + + + + - - - - -
- -
状态禁用后,当前账号则无法进行
登录和操作
- 状态禁用后,当前账号则无法进行登... - - + + + + - - - - -
- -
加油时选择加油员场景使用,选择不显示加油员将无法被指定
(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)
- 加油时选择加油员场景使用,选择... - - + + + + + + + + + +
+
+ + 显示 +
+
+ + 隐藏 +
+
+
+
+ + 显示 +
+
+ + 隐藏 +
+
- - - - -
- -
收款成功接收的公众号模板消息通知,需
关注公众号,且本站小程序中会员手机号
信息与当前员工手机号一致
- 收款成功接收的公众号模板消息... - - + * 若用户的一键加油设置为隐藏，则收银台无法选择该员工 + - - - - - - - + + @@ -216,380 +213,497 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java index d7c664c01..b9ce6afa5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.api.fuyou.entity.OilConfig; import com.fuint.api.fuyou.entity.PaymentRuleConfig; import com.fuint.api.fuyou.mapper.PaymentRuleConfigMapper; +import com.fuint.api.fuyou.service.MerchantConfigService; import com.fuint.api.fuyou.service.OilConfigService; import com.fuint.api.fuyou.service.PaymentRuleConfigService; import com.fuint.api.fuyou.vo.OilConfigVo; @@ -24,6 +25,8 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl selectList(PaymentRuleConfig paymentRuleConfig) { @@ -106,6 +109,10 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl impl String timestamp = dateFormat.format(new Date()); String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6); account.setAccountKey(timestamp+randomString); - account.setAccountName(staff.getMobile()); + if (ObjectUtil.isNotEmpty(staff.getAccountName())){ + account.setAccountName(staff.getAccountName()); + }else { + account.setAccountName(staff.getMobile()); + } account.setAccountStatus(1); account.setRealName(staff.getRealName()); account.setRoleIds(staff.getRoleId()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java index 0c3e6cfb7..d7665717c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java @@ -375,4 +375,8 @@ public class BackendStoreController extends BaseController { return getSuccessResult(storeService.getStoreAmountByTime(store)); } + @GetMapping("/getStoreByDeptId/{deptId}") + public ResponseObject getStoreByDeptId(@PathVariable Integer deptId){ + return getSuccessResult(storeService.getStoreByDeptId(deptId)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java index 42f525753..7d0152c74 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java @@ -137,4 +137,6 @@ public interface StoreService extends IService { * @return */ List getStoreAmountByTime(MtStore store); + + List getStoreByDeptId(Integer deptId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java index a336f9e98..d5ecf4bb7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java @@ -754,6 +754,14 @@ public class StoreServiceImpl extends ServiceImpl implem return baseMapper.selectStoreNum(store,storeIds); } + @Override + public List getStoreByDeptId(Integer deptId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("if_delete","0"); + queryWrapper.eq("contract_dept_id",deptId); + return baseMapper.selectList(queryWrapper); + } + // 将在部门里面删除的在油站中删除 public void beachDelStore() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper();