fixbug

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

@@ -1,21 +1,17 @@
 package com.yiqi.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.yiqi.common.constant.UrlConstants;
+import com.yiqi.common.core.domain.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.yiqi.common.annotation.Log;
 import com.yiqi.common.core.controller.BaseController;
 import com.yiqi.common.core.domain.AjaxResult;
@@ -77,6 +73,19 @@ public class SysConfigRecordController extends BaseController {
         return success(sysConfigRecordService.selectSysConfigRecordById(id));
     }
 
+
+    @ApiOperation("通过参数获取参数配置，多个参数用英文逗号隔开")
+    @GetMapping(value = "getConfigValueByKey")
+    public AjaxResult getConfigValueByKey(@RequestParam String configKeys) {
+        String[] keys = configKeys.split(";");
+        List<SysConfigRecord> sysConfigRecordList = sysConfigRecordService.getConfigRecordByKey(keys);
+        Map<String, Object> map = new HashMap<>();
+        for (SysConfigRecord record : sysConfigRecordList) {
+            map.put(record.getMenuName(), record.getValue());
+        }
+        return success(map);
+    }
+
     /**
      * 新增配置
      */

yiqi-api/src/main/java/com/yiqi/api/controller/system/WeAppCommonController.java

@@ -46,18 +46,13 @@ public class WeAppCommonController extends BaseController {
     @ApiOperation("通过参数获取参数配置，多个参数用英文逗号隔开")
     @GetMapping(value = "getConfigValueByKey")
     public R getConfigValueByKey(@RequestParam String configKeys) {
-        String[] keys = configKeys.split(",");
+        String[] keys = configKeys.split(";");
         List<SysConfigRecord> sysConfigRecordList = sysConfigRecordService.getConfigRecordByKey(keys);
-        List<Map> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
         for (SysConfigRecord record : sysConfigRecordList) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("key", record.getMenuName());
-            map.put("value", record.getValue());
-            map.put("info", record.getInfo());
-            map.put("desc", record.getDescition());
-            list.add(map);
+            map.put(record.getMenuName(), record.getValue());
         }
-        return R.ok(list);
+        return R.ok(map);
     }
 
     @ApiOperation("通过分组关键词获取参数配置")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/OrderClothDTO.java

@@ -42,6 +42,9 @@ public class OrderClothDTO {
     @ApiModelProperty("现金代金券抵扣金额")
     private BigDecimal cashDeductAmount;
 
+    @ApiModelProperty("配送费抵扣金额")
+    private BigDecimal deliveryDeductAmount;
+
     @ApiModelProperty("折扣活动ID")
     private Long activityId;