记得上下班打卡 | git大法好,push需谨慎

Commit ac846ef1 authored by 胡佳晨's avatar 胡佳晨

提交 测试

parent 07002ca1
...@@ -4,6 +4,7 @@ import lombok.Data; ...@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
@Data @Data
public class GoblinPayInnerResultVo implements Serializable, Cloneable { public class GoblinPayInnerResultVo implements Serializable, Cloneable {
...@@ -19,6 +20,7 @@ public class GoblinPayInnerResultVo implements Serializable, Cloneable { ...@@ -19,6 +20,7 @@ public class GoblinPayInnerResultVo implements Serializable, Cloneable {
private BigDecimal price; private BigDecimal price;
private Object payData; private Object payData;
private String msg; private String msg;
private List<String> orderIdList;
public String getMsg() { public String getMsg() {
return msg == null ? "" : msg; return msg == null ? "" : msg;
......
...@@ -39,10 +39,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -39,10 +39,7 @@ import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.HashMap; import java.util.*;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import static com.liquidnet.commons.lang.util.DateUtil.*; import static com.liquidnet.commons.lang.util.DateUtil.*;
...@@ -155,6 +152,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -155,6 +152,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
// throw new Exception("参数异常"); // throw new Exception("参数异常");
} }
ResponseDto<GoblinPayInnerResultVo> data = payOrder(preParam, orderSqlParams, uid); ResponseDto<GoblinPayInnerResultVo> data = payOrder(preParam, orderSqlParams, uid);
data.getData().setOrderIdList(Arrays.asList(preParam.getOrderIdList().split(",")));
log.info(UserPathDto.setData("下单(唤起支付)", param, data)); log.info(UserPathDto.setData("下单(唤起支付)", param, data));
return data; return data;
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment