|
|
|
@@ -46,14 +46,14 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
public ResultData createOrder(@RequestBody Map<String,Object> map) { |
|
|
|
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> createOrder >>>>>>>>>>>>>"+map.toString()); |
|
|
|
|
|
|
|
String transactionId = (String) map.get("transactionId");//***订单Id |
|
|
|
String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 |
|
|
|
String shopName = (String) map.get("shopName");//门店名称 |
|
|
|
String userNumber = (String) map.get("userNumber");//***会员Id |
|
|
|
String userPhone = (String) map.get("userPhone");//会员手机号 |
|
|
|
String timeEnd = (String) map.get("timeEnd");//***付款时间(yyyy-MM-dd HH:mm:ss) |
|
|
|
String amount = (String) map.get("amount");//***付款金额(分) |
|
|
|
String summary = (String) map.get("summary");//付款摘要 |
|
|
|
String transactionId = String.valueOf(map.get("transactionId"));//***订单Id |
|
|
|
String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店 |
|
|
|
String shopName = String.valueOf(map.get("shopName"));//门店名称 |
|
|
|
String userNumber = String.valueOf(map.get("userNumber"));//***会员Id |
|
|
|
String userPhone = String.valueOf(map.get("userPhone"));//会员手机号 |
|
|
|
String timeEnd = String.valueOf(map.get("timeEnd"));//***付款时间(yyyy-MM-dd HH:mm:ss) |
|
|
|
String amount = String.valueOf(map.get("amount"));//***付款金额(分) |
|
|
|
String summary = String.valueOf(map.get("summary"));//付款摘要 |
|
|
|
|
|
|
|
if(StringUtils.isBlank(transactionId)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); |
|
|
|
@@ -120,11 +120,11 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
public ResultData orderRefund(@RequestBody Map<String,Object> map) { |
|
|
|
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> orderRefund >>>>>>>>>>>>>"+map.toString()); |
|
|
|
|
|
|
|
String transactionId = (String) map.get("transactionId");//***订单Id |
|
|
|
String refundTime = (String) map.get("refundTime");//***退款时间(yyyy-MM-dd HH:mm:ss) |
|
|
|
String refundSummary = (String) map.get("refundSummary");//退款摘要 |
|
|
|
String refundAmount = (String) map.get("refundAmount");//退款金额(分) |
|
|
|
String refundId = (String) map.get("refundId");//**退款Id |
|
|
|
String transactionId = String.valueOf(map.get("transactionId"));//***订单Id |
|
|
|
String refundTime = String.valueOf(map.get("refundTime"));//***退款时间(yyyy-MM-dd HH:mm:ss) |
|
|
|
String refundSummary = String.valueOf(map.get("refundSummary"));//退款摘要 |
|
|
|
String refundAmount = String.valueOf(map.get("refundAmount"));//退款金额(分) |
|
|
|
String refundId = String.valueOf(map.get("refundId"));//**退款Id |
|
|
|
|
|
|
|
if(StringUtils.isBlank(transactionId)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); |
|
|
|
@@ -181,14 +181,14 @@ public class UserThirdCircleOrderController extends BaseController { |
|
|
|
public ResultData pointDeduction(@RequestBody Map<String,Object> map) { |
|
|
|
logger.info("UserThirdCircleOrderController >>>>>>>>>>>> pointDeduction >>>>>>>>>>>>>"+map.toString()); |
|
|
|
|
|
|
|
String transactionId = (String) map.get("transactionId");//***订单Id |
|
|
|
String shopNumber = (String) map.get("shopNumber");//***门店唯一标识 对应双方平台门店 |
|
|
|
String shopName = (String) map.get("shopName");//门店名称 |
|
|
|
String userNumber = (String) map.get("userNumber");//***会员Id |
|
|
|
String userPhone = (String) map.get("userPhone");//会员手机号 |
|
|
|
String timeEnd = (String) map.get("timeEnd");//***抵扣时间 |
|
|
|
String amount = (String) map.get("amount");//***积分数量 |
|
|
|
String summary = (String) map.get("summary");//摘要 |
|
|
|
String transactionId = String.valueOf(map.get("transactionId"));//***订单Id |
|
|
|
String shopNumber = String.valueOf(map.get("shopNumber"));//***门店唯一标识 对应双方平台门店 |
|
|
|
String shopName = String.valueOf(map.get("shopName"));//门店名称 |
|
|
|
String userNumber = String.valueOf(map.get("userNumber"));//***会员Id |
|
|
|
String userPhone = String.valueOf(map.get("userPhone"));//会员手机号 |
|
|
|
String timeEnd = String.valueOf(map.get("timeEnd"));//***抵扣时间 |
|
|
|
String amount = String.valueOf(map.get("amount"));//***积分数量 |
|
|
|
String summary = String.valueOf(map.get("summary"));//摘要 |
|
|
|
|
|
|
|
if(StringUtils.isBlank(transactionId)){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空"); |
|
|
|
|