Commit 80ac4674 by shuhu.hou@freemud.cn

Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop

parents 9fe81284 1b59e95d
...@@ -73,6 +73,7 @@ public class OrderSdkAdapter { ...@@ -73,6 +73,7 @@ public class OrderSdkAdapter {
request.setStoreName(requestVO.getShopName()); request.setStoreName(requestVO.getShopName());
request.setPayTime(requestVO.getPayTime()); request.setPayTime(requestVO.getPayTime());
request.setThirdStoreId(requestVO.getThirdShopId()); request.setThirdStoreId(requestVO.getThirdShopId());
request.setThirdOrderCode(requestVO.getThirdOrderCode());
if (requestVO.getOrderStatus() != null) { if (requestVO.getOrderStatus() != null) {
request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode())); request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode()));
} }
......
...@@ -39,6 +39,10 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -39,6 +39,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/ */
private String userName; private String userName;
/** /**
* 三方单号
*/
private String thirdOrderCode;
/**
* 用户电话 * 用户电话
*/ */
private String phone; private String phone;
......
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