diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index db16d294e..f4b1cf33e 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -291,6 +291,8 @@ export default {
this.$modal.msgSuccess("添加成功");
this.getList()
this.dialogVisible = false
+ }else {
+ this.$modal.msgError("添加失败，此通道暂未配置");
}
})
}
diff --git a/fuintAdmin_zt/src/api/login.js b/fuintAdmin_zt/src/api/login.js
index fca43c04c..11b9aa9ad 100644
--- a/fuintAdmin_zt/src/api/login.js
+++ b/fuintAdmin_zt/src/api/login.js
@@ -26,6 +26,15 @@ export function getInfo() {
})
}
+// 获取手机验证码
+export function gettelcode(data) {
+ return request({
+ url: 'backendApi/login/sendMsg',
+ method: 'post',
+ data:data
+ })
+}
+
// 退出方法
export function logout() {
return request({
diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
index c65cbc22d..0006b2d5e 100644
--- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
+++ b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js
@@ -28,6 +28,15 @@ export function editMerchant(data) {
})
}
+// 修改商户备注信息
+export function editMerchantRemark(data) {
+ return request({
+ url: '/api/merchantConfig/edit',
+ method: 'post',
+ data: data,
+ })
+}
+
// 添加商户使用状态
export function addMerchantApi(data) {
@@ -44,4 +53,4 @@ export function merchantInfo(id) {
url: '/api/merchantConfig/'+id,
method: 'get',
})
-}
\ No newline at end of file
+}
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index 75fe90b7a..fb786cc8d 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -38,7 +38,23 @@
当前使用中
商户编号: {{ item.mchntCd }}
- 备注: {{ item.remark ? item.remark : "--" }}
+
+ 备注: {{ item.remark ? item.remark : "--" }}
+
+ 修改
+ 删除
+
+
@@ -268,6 +284,16 @@ export default {
this.getList();
},
methods:{
+ handleUpdate(data){
+ merchantInfo(data.id).then(res => {
+ this.title = "商户信息"
+ this.dialogVisible = true
+ this.form1 = res.data
+ })
+ },
+ handleDelete(data){
+
+ },
// 修改商户备注信息
submitRemark(){
editMerchantRemark(this.merchantConfig).then(res => {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
index 3432f704c..71e202956 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
@@ -66,8 +66,9 @@ public class MerchantConfigController extends BaseController {
public ResponseObject selectMerchant(@PathVariable Integer id){
return getSuccessResult(merchantConfigService.selectMerchById(id));
}
+
/**
- * 修改商户备注信息
+ * 修改商户信息
* @param merchantConfig
* @return
*/
@@ -75,4 +76,14 @@ public class MerchantConfigController extends BaseController {
public ResponseObject editMerchantRemark(@RequestBody MerchantConfig merchantConfig){
return getSuccessResult(merchantConfigService.updateMerchRemark(merchantConfig));
}
+
+ /**
+ * 删除商户信息
+ * @param id
+ * @return
+ */
+ @DeleteMapping("{id}")
+ public ResponseObject delete(@PathVariable Integer id){
+ return getSuccessResult(merchantConfigService.deleteMerch(id));
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
index e32487b6b..e87aa2999 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
@@ -90,4 +90,11 @@ public interface MerchantConfigService extends IService {
* @return
*/
public int insertMerch(MerchantConfig merchantConfig);
+
+ /**
+ * 根据id删除配置信息
+ * @param id
+ * @return
+ */
+ public int deleteMerch(Integer id);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index b1f09d808..c50b65c14 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -99,10 +99,9 @@ public class MerchantConfigServiceImpl extends ServiceImpl();
queryWrapper.eq("is_use",1);
- queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+ queryWrapper.eq("store_id",merchantConfig.getStoreId());
List list = baseMapper.selectList(queryWrapper);
for (MerchantConfig config : list) {
config.setIsUse("0");
@@ -149,6 +148,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl