update 分成功能

jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java

@@ -0,0 +1,11 @@
+package com.jsowell.pile.dto;
+
+import lombok.Data;
+
+@Data
+public class SplitConfigDTO {
+    private String merchantId;
+
+    private String stationId;
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java

@@ -0,0 +1,18 @@
+package com.jsowell.pile.dto;
+
+import lombok.Data;
+
+@Data
+public class SplitDetailDTO {
+    // 汇付会员id
+    private String adapayMemberId;
+
+    // 电量分成比例
+    private String electricitySplitRatio;
+
+    // 服务费分成比例
+    private String serviceSplitRatio;
+
+    // 是否承担手续费承担方
+    private String isServiceCharge;
+}

jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java

@@ -1,5 +1,15 @@
 package com.jsowell.pile.mapper;
 
+import com.jsowell.pile.domain.StationSplitConfig;
+
+import java.util.List;
+
 public interface StationSplitConfigMapper {
 
+    /**
+     * 根据站点编号查询
+     * @param stationId
+     * @return
+     */
+    List<StationSplitConfig> queryByStationId(String stationId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java

@@ -60,23 +60,44 @@ public class PileSnGenerateService {
 				// 缓存中没有，从数据库中取
 				PileBasicInfo pileInfo = pileBasicInfoService.getMaxNumPileInfo();
 				String pileSn = pileInfo.getSn();
-				// 将前四位截取，并将后面转为long
-				Long pileSnNum = Long.parseLong(StringUtils.substring(pileSn, 4, pileSn.length()));
-				// String pileSnNum = StringUtils.substring(pileSn, 4, pileSn.length());
+				// 将前四位截取，并将后面转为int
+				pileNum = Integer.parseInt(StringUtils.substring(pileSn, 4, pileSn.length()));
 				// 再将该值存入数据库
-				redisCache.setCacheObject(key, pileSnNum.intValue());
+				redisCache.setCacheObject(key, pileNum);
 			}
 			Long increNum = redisCache.increment(key, 1);
 			// 年份
 			int year = LocalDate.now().getYear() - 2000;
 			//不足补位
 			increResult = prefix + year + String.format("%1$010d", increNum);
+
+			// 保存到字典中
+			savePileSn2Dict(pileNum);
 		} catch (Exception e) {
 			logger.error("获取序列号失败", e);
 		}
 		return increResult;
 	}
 
+	private void savePileSn2Dict(long pileSnNum) {
+		SysDictData queryData = new SysDictData();
+		queryData.setDictType(pile_sn_generate_type);
+		queryData.setDictLabel(EV_PILE_SN_LABEL);
+		List<SysDictData> sysDictData = dictDataService.selectDictDataList(queryData);
+		if (CollectionUtils.isNotEmpty(sysDictData)) {
+			SysDictData dictData = sysDictData.get(0);
+			dictData.setDictValue(pileSnNum + "");
+			dictDataService.updateDictData(dictData);
+		} else {
+			SysDictData dictData = new SysDictData();
+			dictData.setDictType(pile_sn_generate_type);
+			dictData.setDictLabel(EBIKE_PILE_SN_LABEL);
+			dictData.setDictValue(pileSnNum + "");
+			dictData.setListClass(Constants.DEFAULT);
+			dictData.setCreateBy(Constants.SYSTEM);
+			dictDataService.insertDictData(dictData);
+		}
+	}
 
 	/**
 	 * 批量生成sn号
@@ -131,18 +152,18 @@ public class PileSnGenerateService {
 			pileSnNum += 1;
 			// 再将该值存入数据库
 			increResult = prefix + year + String.format("%1$04d", pileSnNum);
-			save2Dict(year, pileSnNum);
+			saveEBikeSn2Dict(year, pileSnNum);
 		} else {
 			// 没有值, 从1开始, 并保存到字典中
 			Long pileSnNum = 1L;
 			increResult = prefix + year + String.format("%1$04d", pileSnNum);
-			save2Dict(year, pileSnNum);
+			saveEBikeSn2Dict(year, pileSnNum);
 		}
 		return increResult;
 	}
 
 
-	private void save2Dict(int year, long pileSnNum) {
+	private void saveEBikeSn2Dict(int year, long pileSnNum) {
 		SysDictData queryData = new SysDictData();
 		queryData.setDictType(pile_sn_generate_type);
 		queryData.setDictLabel(EBIKE_PILE_SN_LABEL + year);

jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java

@@ -1,6 +1,15 @@
 package com.jsowell.pile.service;
 
+import com.jsowell.pile.domain.StationSplitConfig;
+
+import java.util.List;
+
 public interface StationSplitConfigService{
 
+    // 根据站点id查询站点分账配置信息
+    List<StationSplitConfig> queryByStationId(String stationId);
+
+    // 插入站点分账配置信息
+    int insert(StationSplitConfig record);
 
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java

@@ -1,14 +1,21 @@
 package com.jsowell.pile.service.impl;
 
+import com.jsowell.pile.domain.StationSplitConfig;
 import com.jsowell.pile.mapper.StationSplitConfigMapper;
 import com.jsowell.pile.service.StationSplitConfigService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+
 @Service
 public class StationSplitConfigServiceImpl implements StationSplitConfigService{
 
     @Resource
     private StationSplitConfigMapper stationSplitConfigMapper;
 
+    @Override
+    public List<StationSplitConfig> queryByStationId(String stationId) {
+        return stationSplitConfigMapper.queryByStationId(stationId);
+    }
 }

jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml

@@ -22,4 +22,11 @@
     create_by, create_time, update_by, update_time, del_flag
   </sql>
 
+  <select id="queryByStationId" resultMap="BaseResultMap">
+    select
+        <include refid="Base_Column_List" />
+    from station_split_config
+    where del_flag = '0'
+    and station_id = #{stationId}
+  </select>
 </mapper>

jsowell-ui/src/api/pile/splitConfig.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询站点白名单列表
+export function listWhitelist(query) {
+  return request({
+    url: '/pile/whitelist/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询站点白名单详细
+export function getWhitelist(id) {
+  return request({
+    url: '/pile/whitelist/' + id,
+    method: 'get'
+  })
+}
+
+// 新增站点白名单
+export function addWhitelist(data) {
+  return request({
+    url: '/pile/whitelist',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改站点白名单
+export function updateWhitelist(data) {
+  return request({
+    url: '/pile/whitelist',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除站点白名单
+export function delWhitelist(id) {
+  return request({
+    url: '/pile/whitelist/' + id,
+    method: 'delete'
+  })
+}

jsowell-ui/src/views/pile/station/detail.vue

@@ -151,6 +151,10 @@
       <el-tab-pane label="订单日报" name="orderReport">
         <order-report ref="orderReport"></order-report>
       </el-tab-pane>
+
+      <el-tab-pane label="分成配置" name="orderReport">
+        <order-report ref="orderReport"></order-report>
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">

jsowell-ui/src/views/pile/station/splitConfig.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="交易日期" prop="tradeDate">
+      <el-date-picker
+          v-model="value"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :clearable=false
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+
+
+    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="交易日期" align="center" prop="tradeDate" />
+      <el-table-column label="用电度数" align="center" prop="useElectricity" />
+      <el-table-column label="充电次数" align="center" prop="chargeNum" />
+      <el-table-column label="充电时长" align="center" prop="chargeTime" />
+      <el-table-column label="电费金额" align="center" prop="electricityAmount" />
+      <el-table-column label="服务费金额" align="center" prop="serviceAmount" />
+      <el-table-column label="收入金额" align="center" prop="totalAmount" />
+      <el-table-column label="虚拟金额" align="center" prop="virtualAmount" />
+      <el-table-column label="交易金额" align="center" prop="tradeAmount" />
+      <el-table-column label="交易手续费" align="center" prop="tradeFee" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改结算订单报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="运营商id" prop="merchantId">
+          <el-input v-model="form.merchantId" placeholder="请输入运营商id" />
+        </el-form-item>
+        <el-form-item label="站点id" prop="stationId">
+          <el-input v-model="form.stationId" placeholder="请输入站点id" />
+        </el-form-item>
+        <el-form-item label="用电度数" prop="useElectricity">
+          <el-input v-model="form.useElectricity" placeholder="请输入用电度数" />
+        </el-form-item>
+        <el-form-item label="充电次数" prop="chargeNum">
+          <el-input v-model="form.chargeNum" placeholder="请输入充电次数" />
+        </el-form-item>
+        <el-form-item label="充电时长" prop="chargeTime">
+          <el-input v-model="form.chargeTime" placeholder="请输入充电时长" />
+        </el-form-item>
+        <el-form-item label="电费金额" prop="electricityAmount">
+          <el-input v-model="form.electricityAmount" placeholder="请输入电费金额" />
+        </el-form-item>
+        <el-form-item label="服务费金额" prop="serviceAmount">
+          <el-input v-model="form.serviceAmount" placeholder="请输入服务费金额" />
+        </el-form-item>
+        <el-form-item label="收入金额" prop="totalAmount">
+          <el-input v-model="form.totalAmount" placeholder="请输入收入金额" />
+        </el-form-item>
+        <el-form-item label="虚拟金额" prop="virtualAmount">
+          <el-input v-model="form.virtualAmount" placeholder="请输入虚拟金额" />
+        </el-form-item>
+        <el-form-item label="交易日期" prop="tradeDate">
+          <el-input v-model="form.tradeDate" placeholder="请输入交易日期" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="tradeAmount">
+          <el-input v-model="form.tradeAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="交易手续费" prop="tradeFee">
+          <el-input v-model="form.tradeFee" placeholder="请输入交易手续费" />
+        </el-form-item>
+        <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listReport, getReport, delReport, addReport, updateReport } from "@/api/settle/orderReport";
+
+export default {
+  name: "Report",
+  data() {
+    return {
+      value:'',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 结算订单报表格数据
+      reportList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        merchantId: null,
+        stationId: null,
+        useElectricity: null,
+        chargeNum: null,
+        chargeTime: null,
+        electricityAmount: null,
+        serviceAmount: null,
+        totalAmount: null,
+        virtualAmount: null,
+        tradeDate: null,
+        tradeAmount: null,
+        tradeFee: null,
+
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    // this.getList();
+  },
+  methods: {
+    /** 查询结算订单报列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.stationId = this.$route.params.id
+      listReport(this.queryParams).then(response => {
+        console.log('查询订单日报',response)
+        this.reportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        merchantId: null,
+        stationId: null,
+        useElectricity: null,
+        chargeNum: null,
+        chargeTime: null,
+        electricityAmount: null,
+        serviceAmount: null,
+        totalAmount: null,
+        virtualAmount: null,
+        tradeDate: null,
+        tradeAmount: null,
+        tradeFee: null,
+        createTime: null,
+        delFlag: null
+      };
+
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      console.log('this.value 日期',this.value)
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.value = null
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加结算订单报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getReport(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改结算订单报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateReport(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addReport(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除结算订单报编号为"' + ids + '"的数据项？').then(function() {
+        return delReport(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('pile/report/export', {
+        ...this.queryParams
+      }, `report_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>