bug
This commit is contained in:
parent
98ff3486a8
commit
1c806f5c4d
@ -330,7 +330,7 @@ export default {
|
||||
if (res.data===1){
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.getList()
|
||||
this.show = false
|
||||
this.dialogVisible = false
|
||||
}
|
||||
})
|
||||
}else {
|
||||
|
||||
@ -59,38 +59,24 @@
|
||||
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
|
||||
<el-table-column label="ID" align="center" prop="id" width="80" />
|
||||
<el-table-column label="姓名" align="center" prop="realName" />
|
||||
<el-table-column label="手机号" align="center" prop="mobile" width="110"/>
|
||||
<el-table-column label="核销权限" align="center" prop="writeOff">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="特殊权限" align="center" prop="specialPrem">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="退款权限" align="center" prop="refund">
|
||||
<el-table-column label="员工角色" align="center" prop="roleId" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.ywqx" :value="scope.row.refund"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核状态" align="center" prop="storeName">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.auditedStatus"
|
||||
active-value="A"
|
||||
inactive-value="N"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
<span v-if="scope.row.roleId=='12'">油站站长</span>
|
||||
<span v-if="scope.row.roleId=='15'">普通员工</span>
|
||||
<span v-if="scope.row.roleId=='16'">收银员</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="手机号" align="center" prop="mobile" />
|
||||
<el-table-column label="员工状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="公众号" align="center" prop="official">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.official" :value="scope.row.official"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="公众号" align="center" prop="official">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <dict-tag :options="dict.type.official" :value="scope.row.official"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="一键加油" align="center" prop="isRefuel">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.display" :value="scope.row.isRefuel"/>
|
||||
@ -106,25 +92,23 @@
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.updateTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="更新时间" align="center" prop="updateTime" width="150">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ parseTime(scope.row.updateTime) }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-hasPermi="['staff:list']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
v-hasPermi="['staff:list']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
@ -143,21 +127,6 @@
|
||||
<!-- 添加或修改对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<!-- <el-row>-->
|
||||
<!-- <el-col :span="24">-->
|
||||
<!-- <el-form-item label="员工类别" prop="category">-->
|
||||
<!-- <el-select v-model="form.category" placeholder="请选择员工类别">-->
|
||||
<!-- <el-option key="0" label="请选择员工类别" value="0"></el-option>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in categoryOptions"-->
|
||||
<!-- :key="item.key"-->
|
||||
<!-- :label="item.name"-->
|
||||
<!-- :value="item.key"-->
|
||||
<!-- ></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="姓名" prop="realName">
|
||||
@ -169,68 +138,22 @@
|
||||
<el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="角色组" prop="role">
|
||||
<el-select v-model="form.role" placeholder="请选择角色">
|
||||
<el-option
|
||||
v-for="dict in dict.type.role"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
<el-select v-model="form.roleId" placeholder="请选择角色">
|
||||
<el-option label="油站站长" :value="12" ></el-option>
|
||||
<el-option label="普通员工" :value="15" ></el-option>
|
||||
<el-option label="收银员" :value="16" ></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="登录密码" prop="password">
|
||||
<el-input v-model="form.password" placeholder="请输入登录密码" maxlength="30"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="退款权限" prop="refund">
|
||||
<el-select v-model="form.refund" placeholder="请选择权限">
|
||||
<el-option
|
||||
v-for="dict in dict.type.ywqx"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="退款密码" prop="refundPassword">
|
||||
<el-input v-model="form.applypassword" placeholder="请输入登录密码" maxlength="30"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="10" style="display: flex;margin-bottom: 20px">
|
||||
<template>
|
||||
<span style="margin-right: 10px">核销权限</span>
|
||||
<el-checkbox-group v-model="writeOff" ref="" @change="getCheckbox">
|
||||
<el-checkbox
|
||||
v-for="dict in dict.type.write_off"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</template>
|
||||
</el-col>
|
||||
<el-col :span="14" style="display: flex">
|
||||
<span style="margin-right: 10px">特殊权限</span>
|
||||
<el-checkbox-group v-model="specialPrem" @change="getCheckbox">
|
||||
<el-checkbox
|
||||
v-for="dict in dict.type.special_prem"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
@ -253,48 +176,6 @@
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="POS加油员" prop="pos">
|
||||
<el-select v-model="form.pos">
|
||||
<el-option
|
||||
v-for="dict in dict.type.zhzt"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 启用后,当前账户登录POS端后油品收银必选加油员才可进行<br/>下步操作(需系统开启加油选择加油员功能) </div>
|
||||
<span>启用后,当前账户登录POS端后油...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交易统计" prop="transaction">
|
||||
<el-select v-model="form.transaction">
|
||||
<el-option
|
||||
v-for="dict in dict.type.transaction"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 交易订单显示信息、终端支持:(PC、<br/>POS、小程序) </div>
|
||||
<span>交易订单显示信息、终端支持:(PC...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="收款通知" prop="notice">
|
||||
<el-select v-model="form.notice">
|
||||
@ -315,182 +196,8 @@
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="指定油枪" prop="oilGunId" v-show="form.notice == 'zdyx'">
|
||||
<el-select v-model="form.oilGunId">
|
||||
<el-option
|
||||
v-for="dict in dict.type.notice"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<span> 多选,已选油枪号的交易将发送模板消息 </span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="时间范围" prop="timeFrame">
|
||||
<el-select v-model="form.timeFrame">
|
||||
<el-option
|
||||
v-for="dict in dict.type.time_frame"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content">当前账户下可查看交易的时间范围(PC、<br/>POS端)</div>
|
||||
<span>当前账户下可查看交易的时间范...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交班模式" prop="handoverMode">
|
||||
<el-select v-model="form.handoverMode">
|
||||
<el-option
|
||||
v-for="dict in dict.type.handover"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<span> 根据需求自行选择模式 </span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交班权限" prop="handoverPrem">
|
||||
<el-select v-model="form.handoverPrem" placeholder="请选择所属店铺">
|
||||
<el-option
|
||||
v-for="dict in dict.type.ywqx"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 若无权限,则无法查看交班统计信息和<br/>进行交班操作 </div>
|
||||
<span>若无权限,则无法查看交班统计...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交班退出" prop="handoverOut">
|
||||
<el-select v-model="form.handoverOut">
|
||||
<el-option
|
||||
v-for="dict in dict.type.handover_quit"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<span> 进行交班处理后是否退出当前账户 </span>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交班记录" prop="record">
|
||||
<el-select v-model="form.record">
|
||||
<el-option
|
||||
v-for="dict in dict.type.jbjl"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 全部记录:查看所有员工交班记录,名下<br/>记录:员工自己名下记录(需有交班权限才可查看),<br/>禁用权限:无权限查看交班记录,记录为空 </div>
|
||||
<span>全部记录:查看所有员工交班记录...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="交班商户号" prop="merchantStatus">
|
||||
<el-select v-model="form.merchantStatus">
|
||||
<el-option
|
||||
v-for="dict in dict.type.zhzt"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 交班信息是否显示商户号统计信息,禁<br/>用后当前员工则无商户号统计信息 </div>
|
||||
<span>交班信息是否显示商户号统计信...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="员工筛选" prop="screen">
|
||||
<el-select v-model="form.screen">
|
||||
<el-option
|
||||
v-for="dict in dict.type.zhzt"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 交易信息是否可以筛选员工进行查<br/>询,启用后可筛选、则反之 </div>
|
||||
<span>交易信息是否可以筛选员工进行...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="POS权限" prop="posPrem">
|
||||
<div class="block">
|
||||
<el-cascader
|
||||
v-model="posPrem"
|
||||
:options="posOptions"
|
||||
:props="props"
|
||||
@change="handleNodeClick1"
|
||||
clearable></el-cascader>
|
||||
<br/>
|
||||
<span> POS手持机中功能对应操作权限 </span>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="小程序权限" prop="appletPrem">
|
||||
<div class="block">
|
||||
<el-cascader
|
||||
v-model="appletPrem"
|
||||
:options="appletOptions"
|
||||
:props="props"
|
||||
@change="handleNodeClick2"
|
||||
clearable></el-cascader>
|
||||
<br/>
|
||||
<span> 小程序管理端功能对应操作权限 </span>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="账户状态" prop="status">
|
||||
<el-select v-model="form.status">
|
||||
|
||||
@ -469,6 +469,7 @@ public class FyPayServiceImpl implements FyPayService {
|
||||
returnParameter.setReservedTransactionId(resMap.get("reserved_transaction_id"));
|
||||
|
||||
res.put("data",returnParameter);
|
||||
res.put("resultMsg",resMap.get("result_msg"));
|
||||
return res;
|
||||
}else {
|
||||
throw new Exception("验签失败，请联系管理员!");
|
||||
|
||||
@ -42,7 +42,7 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
MerchantConfig merchantConfig = merchantConfigService.selectMerchById(list.get(i).getMerchConfigId());
|
||||
amountAll += merchantConfig.getAmount();
|
||||
proList.add((double) (list.get(i).getProportion()/100));
|
||||
proList.add(list.get(i).getProportion()/100.0);
|
||||
radioList.add(merchantConfig.getAmount()/amountAll);
|
||||
distanceList.add(proList.get(i) - radioList.get(i));
|
||||
}
|
||||
|
||||
@ -1010,6 +1010,19 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
// 调用支付接口
|
||||
try {
|
||||
applet = fyPayService.applet(receiveParameter);
|
||||
String resultMsg = (String) applet.get("resultMsg");
|
||||
// 判断商户订单号是否重复 重复则重新生成订单号
|
||||
if (StringUtils.isNotEmpty(resultMsg)){
|
||||
// 根据日期生成订单信息
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
|
||||
String timestamp = dateFormat.format(new Date());
|
||||
String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
|
||||
String orderNo1 = "2345"+timestamp+randomString;
|
||||
oilOrder.setOrderNo(orderNo1);
|
||||
this.updateOilOrder(oilOrder);
|
||||
receiveParameter.setOrderNo(orderNo1);
|
||||
applet = fyPayService.applet(receiveParameter);
|
||||
}
|
||||
applet.put("orderNo",orderNo);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
@ -45,9 +45,12 @@ public class AlipayController extends BaseController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/getUserid")
|
||||
public ResponseObject getUserId(@RequestBody Map<String,String> map,HttpServletRequest request) throws AlipayApiException {
|
||||
String authCode = map.get("authCode");
|
||||
public ResponseObject getUserId(@RequestBody Map<String,String> map,HttpServletRequest request) throws Exception {
|
||||
logger.info("支付宝授权登录参数：{}", map);
|
||||
String authCode = map.get("authCode");
|
||||
String encryptedData = map.get("encryptedData");
|
||||
// alipayService.getUserMobile(encryptedData);
|
||||
|
||||
String storeId = map.get("storeId");
|
||||
if ("".equals(storeId)) return getFailureResult(0, "支付宝登录失败");
|
||||
// 根据storeId查找对应的连锁店id
|
||||
|
||||
@ -4,5 +4,13 @@ import com.alipay.api.AlipayApiException;
|
||||
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
|
||||
|
||||
public interface AlipayService1 {
|
||||
/**
|
||||
* 获取用户支付宝userId
|
||||
* @param code
|
||||
* @return
|
||||
* @throws AlipayApiException
|
||||
*/
|
||||
public AlipaySystemOauthTokenResponse getAlipayProfile(String code) throws AlipayApiException;
|
||||
|
||||
void getUserMobile(String encryptedData) throws Exception;
|
||||
}
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
package com.fuint.module.AlipayApi.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.alibaba.fastjson.parser.Feature;
|
||||
import com.alipay.api.AlipayApiException;
|
||||
import com.alipay.api.AlipayClient;
|
||||
import com.alipay.api.AlipayConfig;
|
||||
import com.alipay.api.DefaultAlipayClient;
|
||||
import com.alipay.api.internal.util.AlipayEncrypt;
|
||||
import com.alipay.api.internal.util.AlipaySignature;
|
||||
import com.alipay.api.request.AlipaySystemOauthTokenRequest;
|
||||
import com.alipay.api.request.AlipayUserInfoShareRequest;
|
||||
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
|
||||
@ -14,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class AlipayServiceImpl1 implements AlipayService1 {
|
||||
private static final Logger logger = LoggerFactory.getLogger(AlipayServiceImpl1.class);
|
||||
@ -59,4 +67,56 @@ public class AlipayServiceImpl1 implements AlipayService1 {
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getUserMobile(String encryptedData) throws Exception {
|
||||
|
||||
//1. 获取验签和解密所需要的参数
|
||||
Map<String, String> openapiResult = JSON.parseObject(encryptedData,
|
||||
new TypeReference<Map<String, String>>() {
|
||||
}, Feature.OrderedField);
|
||||
String signType = "RSA2";
|
||||
String charset = "UTF-8";
|
||||
String encryptType = "AES";
|
||||
String sign = openapiResult.get("sign");
|
||||
String content = openapiResult.get("response");
|
||||
|
||||
//如果密文的
|
||||
boolean isDataEncrypted = !content.startsWith("{");
|
||||
boolean signCheckPass = false;
|
||||
|
||||
//2. 验签
|
||||
String signContent = content;
|
||||
// String signVeriKey = "你的小程序对应的支付宝公钥（为扩展考虑建议用appId+signType做密钥存储隔离）";
|
||||
String signVeriKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnwDxxSNpBKL8xjtU3leNBy9mIOMYOr0WgxGbCxTMfhUPka9nr8Hbt0GN+7ylNBmxCYvW8kmge4dCOLUPqseM9+HyF9R1NrWBB3zQPVqnD0mKCYr9cEgtx6/eU7oIK1FqAl0G+jNIT3IKWMSXEX09yPKJWS6zk7+FRzOzn11vShTFjmrqWdrisJgRsQ54PHhPkQz7xFojDRqIunlpICWUVA8GwUg02hm5ZEhxpMHEWoJZ6Dj1wPH2Vh4CpIT/mjtD+SvssCpT0/XOEDPajcMRfgoV8fyyN0JNQDVZdMZgSO4aRHQqhC3X5CBXSuv40hHnwjcDjsPcbVav5BtaPp3wPQIDAQAB";
|
||||
// String decryptKey = "你的小程序对应的加解密密钥（为扩展考虑建议用appId+encryptType做密钥存储隔离）"
|
||||
String decryptKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJJM2nlUCidns6anNtGUiCL+J83kNL1nrr6hNktHkrX9bhR8LiBU3qBX+MkGDY4snlbdz+anGWu8YkcMlfBlAr82AsdIS9UTHh3lgsIAZTBZHgzZrxn7vwHfHI6Kw7uGZJbZ320JEG3s0KyvGiW0eqGuWI4BW+sD7b6JoLtNfBq+yF9ObOcs76rNCWz+04BmhCH7i6d8arK8NKgEiI9EjBThGjLRDFK1ryacKpz4UVvIXgxEW5w0MTjo/Q7gp2VLpwE/4jc8QfDFwmGU75L+nhK0rr1l0wwSo7svWFAXvberzMCGyuuLomuh2ldDfERJbIjg/qU66gx0EML1tgpVtFAgMBAAECggEARTArDJuwswXBH3Rq7SRvPza3NbXQD6eR9gjuZcTiyG4ecyMH/40bhK/nbFu+cEzh/HxTnIrI6Xmr+eBoxybhNXsgDu1ttjELUF8i7oftiN7rfJVd0P58CySgQXKYybw65lqF8enA8M1gdkxyYS1Z10igelBKyBwUak9LwBIpM0wrPIFrLhoxIEJC6QJ8EDnm6lKbytvcCa2mMZmtWs8oFxNA/SLRWtdEgHk4hslQVqq4R8B/xUy9Cu4kjdnVMHG2MqFXOiTas3gyKZLGN1ACBfpxxtyw0RAfX294ChV4SIvp10s1VqBFudcQeXeV5ph0NXP1eNt/8o3HIu0vjc0jAQKBgQD5ZtOR19M5vAcxJykh5u01CPdfz2LztqdinCpkBIpFviceW/k1euQFaWbOKdYFUrPnuLgX7Ds6dhSrkoL1+1RiVKUR6AtqIMa4fZJIMJWEPNNYWl8s6u6j11Dkd0B10g5+KV/kKLSlwFuBQnDyHw1ND+WKHqj9vkkzimzfcwedBQKBgQCMxao2IKX8CNjXDuryGkmXac0wxql0nN8AFHjCQGm16GPwlp805nAwsHKfJK45ACeixnWH9Cn6sje3yOUpCw6KG4OougRkrQEkQpoPVrZuXEcZ4j4Wg64VgW9tUAVH/WOV0VDnOBpsM8mbKsLLglb1H9Bx7813IX1pmhm93a0ZQQKBgD6U48/75T/eg7t8xSCBrtIZDuHWy1C2a6gd4bE5Rm0buvsuPwmBbchB248uBktNpmEmA+PU3kPcL3GiEQSibVlDPiyRGpQl51eSAuvkbRBCpxHLk4hU507rj5vUpLMr44Ea5rn80N+qtgtoXakTy6WjsIiJCwSpA/tP5+PmHGn1AoGASY/VhZmEA3OAFMnX3pH8GOKR9kYqMST0p28LN78/Pm7lIskjAxrUT601CJK7dE/vZnE848Gk2judQC38CnmbrHH6WAZ020NI0HD5XsCabotMIGuItG01YEmWN9JUIC16h8Ss+Vbo/9gEJ1CuIHjJBikM3S1J+lIG3lNH1l7r4MECgYEA2eAV0x55cmjC6VIMk3EAVUFbJ1LY1U9irmI6B5e7k/OVcdRksJfMRJwcquYVSfAk4hDrl7x0Qy36XELGvMe/hx07HxeAOXON8gL1b3UHP1zxvXb90YLHseHn9lssABsXS6Enyv3nrzqUi/uzBvpdDE2SRVS6nUr7Yyui6Yl+UPA="
|
||||
;
|
||||
//如果是加密的报文则需要在密文的前后添加双引号
|
||||
if (isDataEncrypted) {
|
||||
signContent = "\"" + signContent + "\"";
|
||||
}
|
||||
try {
|
||||
signCheckPass = AlipaySignature.rsaCheck(signContent, sign, signVeriKey, charset, signType);
|
||||
} catch (AlipayApiException e) {
|
||||
//验签异常, 日志
|
||||
}
|
||||
if(!signCheckPass) {
|
||||
//验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
|
||||
throw new Exception("验签失败");
|
||||
}
|
||||
|
||||
//3. 解密
|
||||
String plainData = null;
|
||||
if (isDataEncrypted) {
|
||||
try {
|
||||
AlipayEncrypt.decryptContent(content, encryptType, decryptKey, charset);
|
||||
} catch (AlipayApiException e) {
|
||||
//解密异常, 记录日志
|
||||
throw new Exception("解密异常");
|
||||
}
|
||||
} else {
|
||||
plainData = content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -298,7 +298,7 @@
|
||||
_this.oilNumberList = res.data;
|
||||
if (res.data){
|
||||
// _this.getOilGun(res.data[0].numberId);
|
||||
_this.oilPrice = res.data[0].gbPrice
|
||||
_this.oilPrice = res.data[0].oilPrice
|
||||
_this.oilUnit = res.data[0].unit
|
||||
_this.oilOrder.oils = res.data[0].oilNameId
|
||||
if (res.data[0].oilGunList){
|
||||
@ -366,7 +366,7 @@
|
||||
// this.getOilGun(data.numberId)
|
||||
this.oilGunList = data.oilGunList
|
||||
this.oilOrder.oilGunNum = data.oilGunList[0].id
|
||||
this.oilPrice = data.gbPrice
|
||||
this.oilPrice = data.oilPrice
|
||||
this.oilUnit = data.unit
|
||||
this.oilOrder.oils = data.oilNameId
|
||||
uni.setStorageSync("tankId",data.oilGunList[0].tankId)
|
||||
|
||||
@ -13,7 +13,9 @@
|
||||
<button class="dl-box" open-type='getPhoneNumber' @getphonenumber="getPhone">手机号快捷登录</button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef MP-ALIPAY -->
|
||||
<button class="dl-box" open-type="getPhoneNumber" @getphonenumber="getUserLogin">手机号快捷登录</button>
|
||||
<!-- <button class="dl-box" open-type="getPhoneNumber" @getphonenumber="getUserLogin">手机号快捷登录</button> -->
|
||||
<button open-type="getAuthorize" scope='phoneNumber' class="dl-box" hover-class="button-active"
|
||||
@getAuthorize="getUserLogin">手机号快捷登录</button>
|
||||
<!-- #endif -->
|
||||
<button class="kk-box" @click="goback">我再看看</button>
|
||||
<view class="dbottom">
|
||||
@ -59,10 +61,16 @@
|
||||
console.log(e)
|
||||
|
||||
let _this = this;
|
||||
my.getAuthCode({
|
||||
scopes: 'auth_base',
|
||||
// my.getAuthCode({
|
||||
my.getPhoneNumber({
|
||||
// scopes: 'auth_base',
|
||||
success: res => {
|
||||
const authCode = res.authCode;
|
||||
let encryptedData = res.response;
|
||||
// _this.setData({
|
||||
// ['userInfo.phone']: "18457621459",
|
||||
// alertPhone: false,
|
||||
// })
|
||||
console.log(res)
|
||||
request({
|
||||
url: "clientApi/sign/alipayLogin/getUserid",
|
||||
@ -72,6 +80,7 @@
|
||||
storeId: 0,
|
||||
staffId: "",
|
||||
phone: "18457621459",
|
||||
encryptedData:encryptedData,
|
||||
},
|
||||
}).then((resp) => {
|
||||
console.log(resp)
|
||||
|
||||
@ -348,6 +348,12 @@
|
||||
})
|
||||
return;
|
||||
}
|
||||
if(res.data.resultMsg == "商户订单号重复"){
|
||||
uni.showToast({
|
||||
title:"商户订单号重复，请重新选择订单信息进行支付！",
|
||||
icon:"none"
|
||||
})
|
||||
}
|
||||
if (res.data.data.reservedPayInfo){
|
||||
_this.orderInfo = JSON.parse(res.data.data.reservedPayInfo);
|
||||
uni.requestPayment({
|
||||
@ -383,7 +389,8 @@
|
||||
console.log('fail:',err);
|
||||
}
|
||||
});
|
||||
}else{
|
||||
}
|
||||
if (_this.appltType== "ALIPAY") {
|
||||
my.tradePay({ tradeNO: res.data.data.reservedTransactionId }, function(resp){
|
||||
if(resp.resultCode == '9000'){
|
||||
console.log("支付成功")
|
||||
@ -835,9 +842,10 @@
|
||||
}else{
|
||||
_this.chooseCardBalance(0)
|
||||
}
|
||||
_this.chooseGrade(res.data.userVo.id,res.data.userVo.gradeId)
|
||||
// _this.chooseGrade(res.data.userVo.id,res.data.userVo.gradeId)
|
||||
})
|
||||
},
|
||||
// getPayment
|
||||
// 获取油品订单
|
||||
getOilOrder() {
|
||||
let _this = this;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user