Commit 57601fd3 by 胡博文

fix

parent 8828f640
...@@ -103,7 +103,10 @@ public class OrderBusinessServiceImpl implements OrderBusinessService { ...@@ -103,7 +103,10 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
extendInfoRequest.setIsQueryLabel(0); extendInfoRequest.setIsQueryLabel(0);
extendInfoRequest.setIsQueryPaid(1); extendInfoRequest.setIsQueryPaid(1);
BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest); BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
OrderExtInfoDto extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class); OrderExtInfoDto extInfoDTO = new OrderExtInfoDto();
if (StringUtils.isNotBlank(confirmOrderRequest.getExtInfo())){
extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
}
if (null == extendInfo.getData()) { if (null == extendInfo.getData()) {
extInfoDTO.setMemberLevel(""); extInfoDTO.setMemberLevel("");
extInfoDTO.setPaidMember(false); extInfoDTO.setPaidMember(false);
...@@ -126,6 +129,14 @@ public class OrderBusinessServiceImpl implements OrderBusinessService { ...@@ -126,6 +129,14 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
return orderSdkAdapter.convent2PayAccessResponse(response); return orderSdkAdapter.convent2PayAccessResponse(response);
} }
public static void main(String[] args) {
BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse<>() ;
extendInfo.setData(new GetMemberExtendInfoResponseDto());
System.out.println(extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName(): "");
}
@Override @Override
public Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request) { public Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request) {
// 合阔pos 商户未接单退款超时时间 // 合阔pos 商户未接单退款超时时间
......
...@@ -479,6 +479,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -479,6 +479,7 @@ public class MallOrderServiceImpl implements MallOrderService {
confirmOrderRequest.setOrderId(orderBean.getOid()); confirmOrderRequest.setOrderId(orderBean.getOid());
confirmOrderRequest.setOrderType(orderBean.getType()); confirmOrderRequest.setOrderType(orderBean.getType());
confirmOrderRequest.setProductOrderCode(orderBean.getOid()); confirmOrderRequest.setProductOrderCode(orderBean.getOid());
confirmOrderRequest.setExtInfo(orderBean.getExtInfo());
List<String> orderIds = new ArrayList<>(); List<String> orderIds = new ArrayList<>();
//拼单调促销开团 //拼单调促销开团
......
...@@ -544,6 +544,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -544,6 +544,7 @@ public class OrderServiceImpl implements Orderservice {
String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc()); String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
var1.setPickUpGoodsNo(pickUpGoodsNo); var1.setPickUpGoodsNo(pickUpGoodsNo);
// 订单支付成功 // 订单支付成功
var1.setExtInfo(extInfo);
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1); com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1);
String string2 = JSONObject.toJSONString(payAccessRes); String string2 = JSONObject.toJSONString(payAccessRes);
JSONObject jsonObject2 = JSONObject.parseObject(string2); JSONObject jsonObject2 = JSONObject.parseObject(string2);
......
...@@ -799,6 +799,7 @@ public class SellCouponOrderServiceImpl { ...@@ -799,6 +799,7 @@ public class SellCouponOrderServiceImpl {
var1.setPayTransId(message.getOut_trade_no()); var1.setPayTransId(message.getOut_trade_no());
var1.setOperator(orderBean.getUserName()); var1.setOperator(orderBean.getUserName());
var1.setEndTransId(message.getEndTransId()); var1.setEndTransId(message.getEndTransId());
var1.setExtInfo(orderBean.getExtInfo());
if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){ if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){
var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
} }
......
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