EMPT / location · 提交

转到一个项目

作者 shenhailong
提交 dd24f8f6b814851fd14b89d581473f49f35fc3e4 1 个父辈 6294532e

添加 订单 支付类型

内嵌 并排对比
正在显示 5 个修改的文件 包含 54 行增加 和 27 行删除
... ... @@ -20,7 +20,6 @@ spring:
thymeleaf:
cache: false
mode: LEGACYHTML5
activiti:
# 检查bpmn文件
check-process-definitions: false
... ... @@ -47,6 +46,7 @@ spring:
date-format: yyyy-MM-dd HH:mm:ss
#时区必须要设置
time-zone: GMT+8
write-dates-as-timestamps: true
#ALWAYS的意思是即时属性为null，仍然也会输出这个key
default-property-inclusion: always
... ... @@ -165,4 +165,4 @@ devops:
singlewindow-tcs-recept: D:\TCSSingleWindow\recive
tianbo-tcs-recept: D:\Data\Receive
cfps-subscribe-dir: D:\系统部署\imf_Warehouse_reader\xmlFromImf
#10079
\ No newline at end of file
#10079
... ...
... ... @@ -28,7 +28,8 @@ public class PayOrderController {
@RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
@RequestParam(value = "orderNumber",required = false) String orderNumber,
@RequestParam(value = "payTime", required = false) String payTime ){
return payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime);
PageInfo<PayRecords> order = payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime);
return order;
}
... ...
package com.sunyo.energy.location.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.sunyo.energy.location.controller.response.ResultJson;
import com.sunyo.energy.location.dao.PayRecordsMapper;
import com.sunyo.energy.location.dao.PayResponseMapper;
import com.sunyo.energy.location.model.PayRecords;
import com.sunyo.energy.location.model.PayResponse;
import com.sunyo.energy.location.service.PayOrderService;
import com.sunyo.energy.location.service.WaterMeterService;
import com.sunyo.energy.location.service.imp.WaterMeterServiceImp;
import com.sunyo.energy.location.websocket.WebSocketServer;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
... ... @@ -21,8 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@Controller
... ... @@ -103,26 +98,52 @@ public class PayRseponeController {
int i = payResponseMapperl.insertSelective(payResponse);
if (i>0){
msg =1;
// 查询该订单设备编号
String orderNumber = payRecordsMapper.findOrderNumber(ORDERID);
// 通知充值水费
if (!"".equals(orderNumber)){
ResultJson resultJson = waterMeterService.payWater(PAYMENT, orderNumber);
if ("200".equals(resultJson.getCode())){
WebSocketServer webSocketServer = new WebSocketServer();
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNumber", ORDERID);
jsonObject.put("success", "Y");
webSocketServer.broadcast(jsonObject.toJSONString());
PayRecords payRecords = new PayRecords();
// 支付类型
if (!"".equals(ACC_TYPE)){
if ("WX".equals(ACC_TYPE)){
payRecords.setPayfesstype(false);
}else {
WebSocketServer webSocketServer = new WebSocketServer();
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNumber", ORDERID);
jsonObject.put("success", "N");
webSocketServer.broadcast(jsonObject.toJSONString());
payRecords.setPayfesstype(true);
}
}
}
if ("Y".equals(SUCCESS)){
payRecords.setOrdernumber(ORDERID);
payRecords.setReamke3("1");
}else {
payRecords.setOrdernumber(ORDERID);
payRecords.setReamke3("0");
}
// 修改订单状态
int i1 = payRecordsMapper.updateByPrimaryKey(payRecords);
if (i1>0){
// 查询该订单设备编号
String orderNumber = payRecordsMapper.findOrderNumber(ORDERID);
// 通知充值水费
if (!"".equals(orderNumber)){
ResultJson resultJson = waterMeterService.payWater(PAYMENT, orderNumber);
if ("200".equals(resultJson.getCode())){
WebSocketServer webSocketServer = new WebSocketServer();
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNumber", ORDERID);
jsonObject.put("success", "Y");
webSocketServer.broadcast(jsonObject.toJSONString());
}else {
WebSocketServer webSocketServer = new WebSocketServer();
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNumber", ORDERID);
jsonObject.put("success", "N");
webSocketServer.broadcast(jsonObject.toJSONString());
}
}
}else {
WebSocketServer webSocketServer = new WebSocketServer();
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNumber", ORDERID);
jsonObject.put("success", "N");
webSocketServer.broadcast(jsonObject.toJSONString());
}
}
return i==1? new ResultJson("200","支付回执信息接受成功"):new ResultJson("500","支付回执信息接受失败");
}
... ...
package com.sunyo.energy.location.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
... ... @@ -10,6 +12,7 @@ public class PayRecords {
private Integer payuserid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date paytime;
private Integer paylocationid;
... ... @@ -60,6 +63,7 @@ public class PayRecords {
this.payuserid = payuserid;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
public Date getPaytime() {
return paytime;
}
... ...
... ... @@ -248,7 +248,8 @@
update pay_records
set
payStatus = 1,
reamke3 = #{reamke3,jdbcType=VARCHAR}
reamke3 = #{reamke3,jdbcType=VARCHAR},
payFessType = #{payfesstype,jdbcType=BIT}
where orderNumber = #{ordernumber,jdbcType=VARCHAR}
</update>
... ...