参数配置

admin-ui/src/api/system/setting.js

@@ -40,8 +40,8 @@ export function classListApi(data) {
    */
   export function setStatusApi(data) {
     return request({
-      url: `setting/config_class/set_status/${data.id}/${data.status}`,
-      method: 'PUT',
+      url: `/mapi/system/configTab/config_class/set_status/${data.id}/${data.status}`,
+      method: 'POST',
     });
   }
   

admin-ui/src/views/system/configTab/list.vue

@@ -85,7 +85,7 @@
     </el-card>
 
     <!-- 新建 表单-->
-    <el-dialog :visible.sync="modals2" :title="`${rowId ? '修改' : '添加'}配置字段`" :close-on-click-modal="false" :show-close="true" width="720px">
+    <el-dialog :visible.sync="modals2" :title="`${rowId ? '修改' : '添加'}配置字段`" :close-on-click-modal="false" :show-close="true" width="720px" append-to-body>
       <el-tabs v-if="!rowId" v-model="typeFrom.type" @tab-click="onhangeTab" class="tabsName">
         <el-tab-pane label="文本框 " name="0"></el-tab-pane>
         <el-tab-pane label="多行文本框" name="1"></el-tab-pane>

yiqi-admin/src/main/java/com/yiqi/web/controller/system/SysDataGroupInfoController.java

@@ -2,6 +2,7 @@ package com.yiqi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import com.yiqi.common.constant.UrlConstants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,16 +35,16 @@ import com.yiqi.common.core.page.TableDataInfo;
 @RestController
 @RequestMapping(UrlConstants.managerApi + "/system/groupData")
 public class SysDataGroupInfoController extends BaseController {
+
     @Autowired
     private ISysDataGroupInfoService sysDataGroupInfoService;
 
 
-    //<editor-folder desc="基础函数">
-/**
- * 查询组合数据详情列表
- */
-@PreAuthorize("@ss.hasPermi('system:groupData:list')")
-@GetMapping("/list")
+    /**
+     * 查询组合数据详情列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:groupData:list')")
+    @GetMapping("/list")
     @ApiOperation(value = "查询组合数据详情列表")
     public TableDataInfo list(SysDataGroupInfo sysDataGroupInfo) {
         startPage();
@@ -60,7 +61,7 @@ public class SysDataGroupInfoController extends BaseController {
     @ApiOperation(value = "导出组合数据详情列表")
     public void export(HttpServletResponse response, SysDataGroupInfo sysDataGroupInfo) {
         List<SysDataGroupInfo> list = sysDataGroupInfoService.selectSysDataGroupInfoList(sysDataGroupInfo);
-        ExcelUtil<SysDataGroupInfo> util = new ExcelUtil<SysDataGroupInfo>(SysDataGroupInfo. class);
+        ExcelUtil<SysDataGroupInfo> util = new ExcelUtil<SysDataGroupInfo>(SysDataGroupInfo.class);
         util.exportExcel(response, list, "组合数据详情数据");
     }
 
@@ -111,16 +112,15 @@ public class SysDataGroupInfoController extends BaseController {
         return toAjax(sysDataGroupInfoService.deleteSysDataGroupInfoByIds(ids));
     }
 
-            /**
-             * 修改组合数据详情状态
-             */
-            @PreAuthorize("@ss.hasPermi('system:groupData:edit')")
-            @Log(title = "组合数据详情", businessType = BusinessType.UPDATE)
-            @PostMapping(value = "updateStatus")
-            @ApiOperation(value = "修改组合数据详情状态")
-            public AjaxResult updateSysDataGroupInfoStatus(@RequestBody SysDataGroupInfo sysDataGroupInfo) {
-                return toAjax(sysDataGroupInfoService.updateSysDataGroupInfoStatus(sysDataGroupInfo));
-            }
+    /**
+     * 修改组合数据详情状态
+     */
+    @PreAuthorize("@ss.hasPermi('system:groupData:edit')")
+    @Log(title = "组合数据详情", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "updateStatus")
+    @ApiOperation(value = "修改组合数据详情状态")
+    public AjaxResult updateSysDataGroupInfoStatus(@RequestBody SysDataGroupInfo sysDataGroupInfo) {
+        return toAjax(sysDataGroupInfoService.updateSysDataGroupInfoStatus(sysDataGroupInfo));
+    }
 
-    //</editor-folder>
 }

yiqi-admin/src/main/java/com/yiqi/web/controller/system/SysSettlementRateController.java

@@ -108,7 +108,6 @@ public class SysSettlementRateController extends BaseController {
     @GetMapping ("/insertAllRate")
     @ApiOperation(value = "新增全部结算费率")
     public AjaxResult insertAllRate() {
-        sysSettlementRateService.insertAllRate();
         return toAjax(true);
     }
 

yiqi-common/src/main/java/com/yiqi/common/enums/SysConfigKey.java

@@ -1,25 +1,6 @@
 package com.yiqi.common.enums;
 
 public enum SysConfigKey {
-    FactorySettlementMaterialRate("factory.settlement.material.rate", "工厂结算费率-材料费率"),
-    FactorySettlementManageRate("factory.settlement.manage.rate", "工厂结算费率-管理费率"),
-    FactorySettlementDepositRate("factory.settlement.deposit.rate", "工厂结算费率-押金费率"),
-//    FactorySettlementOtherStoreRate("factory.settlement.other.store.rate", "工厂结算费率-异店消费费率"),
-//    FactorySettlementPayRate("factory.settlement.pay.rate", "工厂结算费率-支付费率"),
-//    FactorySettlementAliRate("factory.settlement.ali.rate", "工厂结算费率-支付宝费率"),
-//    FactorySettlementWXRate("factory.settlement.wx.rate", "工厂结算费率-微信费率"),
-    FactorySettlementOnlineWashRate("factory.settlement.onlineWash.rate", "工厂结算费率-云洗费率"),
-
-
-    StoreSettlementFactoryRate("store.settlement.factory.rate", "门店结算费率-工厂结算费率"),
-    StoreSettlementMaterialRate("store.settlement.material.rate", "门店结算费率-材料费率"),
-    StoreSettlementManageRate("store.settlement.manage.rate", "门店结算费率-管理费率"),
-    StoreSettlementDepositRate("store.settlement.deposit.rate", "门店结算费率-押金费率"),
-    StoreSettlementOtherStoreRate("store.settlement.other.store.rate", "门店结算费率-异店消费费率"),
-//    StoreSettlementPayRate("store.settlement.pay.rate", "门店结算费率-支付费率"),
-    StoreSettlementAliRate("store.settlement.ali.rate", "门店结算费率-支付宝费率"),
-    StoreSettlementWXRate("store.settlement.wx.rate", "门店结算费率-微信费率"),
-
 
     SysHangerMaxCount("sys.hanger.max.count", "挂架-单个点位最大可挂数量"),
     OrderClothDefaultSpeed("order.cloth.default.speed", "洗衣订单-默认洗衣速度"),

yiqi-common/src/main/java/com/yiqi/system/service/ISysSettlementRateService.java

@@ -53,30 +53,5 @@ public interface ISysSettlementRateService extends IService<SysSettlementRate> {
      */
     public int deleteSysSettlementRateByIds(Long[] ids);
 
-    /**
-     * 删除结算费率信息
-     *
-     * @param id 结算费率主键
-     * @return 结果
-     */
-    public int deleteSysSettlementRateById(Long id);
-
-
-    /**
-     * 批量新增工厂和费率关系
-     *
-     * @param manageFactory 工厂实例
-     * @return 结果
-     */
-    public int insertFactoryRate(ManageFactory manageFactory);
-
-    /**
-     * 批量新增门店和费率关系
-     *
-     * @param sysStore 门店实例
-     * @return 结果
-     */
-    public int insertStoreRate(SysStore sysStore);
 
-    public void insertAllRate();
 }

yiqi-core/src/main/java/com/yiqi/payment/AliPayService.java

@@ -50,6 +50,11 @@ public class AliPayService {
      */
     public static final String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCNHrehof5qxi6qiOVOUUAdx52RZb24iBBk32NyMhT5RvpgbjoT+tha5gdM/YJcjBGOK/K56Q3465BUwM2qLjT9EeF+jTC7CppI2CT2re5/c3vAN/XJ17LPhMlQBBiS6W1WRfWJZF1bT9430K1U8gF50E1Ilbqmt8+QR5TAxgl4mN35Whrhbtkh+qoEGmH0tihqebNiewP1/Lr57qVtANXKhoGj6b8pk8Vir76c3Q5EtSEw1goq3dsAt5bFYavY9WXpG0dexOLK1J8ggryPrUfukSMasQMfd7JX+zjsefXWFcx5oFS19tJKTSlMpnc3WeFJV1dGE9QUHTs8c+KRZQERAgMBAAECggEABDmJMdORtEyelQhoJQIVs06IjxPGrEGWjA6MAZ0yN4xCbqSeJH77/yynx0xHnNGsrN7v81Tg0DTtKzxia9faSkFAyPMdJFxa5hdic+gdHb+tUsHaH+LPPZsyE60rtyo51b1ebnCMwvEPLAiZR9O+65Cq36Nr5RXXpvAdqe/D1NJjYIpSPobQIu2cD5wOv87rzIyNTrFEQNqwRy58mEQBIJeUrGD6JnAY1DIOAiQ+4svUDuVQP+jBuK2vg6TCG/dcQFR8lemjHQKnRaBGpZ21FuDDoRfY5h8t7THP0Sdatr4rGOY70kAVZer+TmWPGuPmS1rNY8rD69oP+n3d410GgQKBgQDCx+YcwFs9xnbHTLGDukaYuZb4bMyyttfhvT6cYXbn2jzEBWhAe07onvDkGGl9CU6Z22Sc7O4cAK4GfIidUDiynd5yQrZBT5Ga87VSOJXPvQ7OwDAeelfatPCNYYQVIYLsSWxNGjeTvyR7JD0s3j1MqIdb8BcV/79OvtxyC0royQKBgQC5eUGGf+1roso3G5okcYp9wQTvP/qnm6lEggCzWkUdnbudQ/+6xwccZnfYqkHZ50dc9swXOibbQeBOnFGm1tUzucmhY0UJhPKatiAagEbfMgzVBkhEKOXnPt4s2iOQDn08sGvH3xYwc58gRrM05BI/pzF7pleX5i3t++pf7EdCCQKBgCIIgYmGhqq9kaVzHhUxKAKpctqHUCDt17ymr1jtorQSKsnpU/ToVrpIgzinl070oFo7vlG5CEW2TLHvcoNiL/XtpZ97TpMMzxku+gCayHpaw0qWxBGfONiLAvkBD+4NQ+37SkQSj6FuJXaqt1GupzFMxRHoWnBKlmew6521oWoZAoGAPCff4MfNMYPzIjyJmhhZWsAn4ZFWstYB6H5hy8oTcK+gEjnjz6iN3eA+Lr/J6+rfcn95Ym8x+xs6rUR2Fy7Gp6gyhW21DolYRmWbs/y2/90z3EPVXIYHSyFQ3itCLY8Ff5GY45Kvl7dofQdxSE5QvOR1YC1ra5D0hKOYONRhqEECgYBr8usEuVMld+fMLbGqc9Jkgu2FvPwjUUY4hOuO6bOiZ8VDujWDoZOWEuT1PCaFwbG3dV0oZNFic0VUOz1ziXlav6+cK6O11//TexFs0UNgdIYs+sllSTbZBM0n8fGy2gucYcQaV7mfp1O/2jlFnMIfhkFVjBLKMGAdAQAlNv7Mpg==";
 
+    /**
+     * 支付宝公钥
+     */
+    public static final String aliPayPublicKey = "/www/server/yiqi_wash_v2/paycert/alipayRootCert.crt";
+
     /**
      * 支付宝公钥
      */
@@ -84,6 +89,7 @@ public class AliPayService {
                     .setCertModel(true)
                     .setAppCertPath(appCertPath)
                     .setAliPayCertPath(aliPayCertPath)
+                    .setAliPayPublicKey("")
                     .setAliPayRootCertPath(aliPayRootCertPath)
                     .setPrivateKey(privateKey)
                     .setCharset("UTF-8")

yiqi-system/src/main/java/com/yiqi/system/service/impl/ManageFactoryServiceImpl.java

@@ -90,7 +90,7 @@ public class ManageFactoryServiceImpl extends ServiceImpl<ManageFactoryMapper, M
         // 新增工厂和全部商品物料的关系
 //        goodsSkuStoreService.insertFactoryToAllSku(manageFactory);
         // 新增结算费率关系
-        sysSettlementRateService.insertFactoryRate(manageFactory);
+//        sysSettlementRateService.insertFactoryRate(manageFactory);
         return i;
     }
 

yiqi-system/src/main/java/com/yiqi/system/service/impl/SysSettlementRateServiceImpl.java

@@ -93,101 +93,4 @@ public class SysSettlementRateServiceImpl extends ServiceImpl<SysSettlementRateM
         return baseMapper.deleteSysSettlementRateByIds(ids);
     }
 
-    /**
-     * 删除结算费率信息
-     *
-     * @param id 结算费率主键
-     * @return 结果
-     */
-    @Override
-    public int deleteSysSettlementRateById(Long id) {
-        return baseMapper.deleteSysSettlementRateById(id);
-    }
-
-    @Override
-    public int insertFactoryRate(ManageFactory manageFactory) {
-        SysSettlementRate sysSettlementRate = new SysSettlementRate();
-        //材料费率
-        sysSettlementRate.setMaterialRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementMaterialRate.getCode())));
-        //管理费率
-        sysSettlementRate.setManageRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementManageRate.getCode())));
-        //押金费率
-        sysSettlementRate.setDepositRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementDepositRate.getCode())));
-        // 云洗费率
-        sysSettlementRate.setFactoryRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementOnlineWashRate.getCode())));
-
-//        //异店消费费率
-//        sysSettlementRate.setOtherStoreRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementOtherStoreRate.getCode())));
-//        //支付宝费率
-//        sysSettlementRate.setAliPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementAliRate.getCode())));
-//        //微信费率
-//        sysSettlementRate.setWxPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementWXRate.getCode())));
-        sysSettlementRate.setSourceType("01");
-        sysSettlementRate.setOrgId(manageFactory.getId());
-        return baseMapper.insertSysSettlementRate(sysSettlementRate);
-    }
-
-    @Override
-    public int insertStoreRate(SysStore sysStore) {
-        SysSettlementRate sysSettlementRate = new SysSettlementRate();
-        //工厂结算费率
-        sysSettlementRate.setFactoryRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementFactoryRate.getCode())));
-        //材料费率
-        sysSettlementRate.setMaterialRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementMaterialRate.getCode())));
-        //管理费率
-        sysSettlementRate.setManageRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementManageRate.getCode())));
-        //押金费率
-        sysSettlementRate.setDepositRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementDepositRate.getCode())));
-        //异店消费费率
-        sysSettlementRate.setOtherStoreRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementOtherStoreRate.getCode())));
-        //支付宝费率
-        sysSettlementRate.setAliPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementAliRate.getCode())));
-        //微信费率
-        sysSettlementRate.setWxPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementWXRate.getCode())));
-        sysSettlementRate.setSourceType("02");
-        sysSettlementRate.setOrgId(sysStore.getId());
-
-        return baseMapper.insertSysSettlementRate(sysSettlementRate);
-    }
-
-    @Override
-    public void insertAllRate() {
-        SysSettlementRate store = new SysSettlementRate();
-        //工厂结算费率
-        store.setFactoryRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementFactoryRate.getCode())));
-        //材料费率
-        store.setMaterialRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementMaterialRate.getCode())));
-        //管理费率
-        store.setManageRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementManageRate.getCode())));
-        //押金费率
-        store.setDepositRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementDepositRate.getCode())));
-        //异店消费费率
-        store.setOtherStoreRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementOtherStoreRate.getCode())));
-        //支付宝费率
-        store.setAliPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementAliRate.getCode())));
-        //微信费率
-        store.setWxPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.StoreSettlementWXRate.getCode())));
-
-        baseMapper.insertAllRateStore(store);
-
-
-
-
-        SysSettlementRate factory = new SysSettlementRate();
-        //材料费率
-        factory.setMaterialRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementMaterialRate.getCode())));
-        //管理费率
-        factory.setManageRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementManageRate.getCode())));
-        //押金费率
-        factory.setDepositRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementDepositRate.getCode())));
-        // 云洗费率
-        factory.setFactoryRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementOnlineWashRate.getCode())));
-//        //异店消费费率
-//        factory.setOtherStoreRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementOtherStoreRate.getCode())));
-//        //支付宝费率
-//        factory.setAliPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementAliRate.getCode())));
-//        //微信费率
-//        factory.setWxPayRate(new BigDecimal(configService.selectConfigByKey(SysConfigKey.FactorySettlementWXRate.getCode())));
-        baseMapper.insertAllRateFactory(factory);
-    }
 }