Skip to content

O
order-group
Commit 50f88aa7 by xiaoer.li@freemud.com
Options

Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop 

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
parents f2b8cd9a 3650e845
Showing with 32 additions and 104 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -323,7 +323,6 @@ public class OrderServiceImpl implements Orderservice {
// 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto, shoppingCartGoodsDto, trackingNo);
boolean svcPay = checkOrder.checkSvcPay(createOrderVo, shoppingCartGoodsDto, trackingNo);
OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
//1.9.2套餐需求同步优化创建订单代码
BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
......@@ -383,28 +382,28 @@ public class OrderServiceImpl implements Orderservice {
log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
}
}
///**
// * 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
// *
// * @param partnerId
// * @param storeId
// * @param fmId
// * @param orderId
// */
//public void putDelMq(String partnerId, String storeId, String fmId, String orderId,Integer payChanelType) {
// PaymentMqMessageDto dto = new PaymentMqMessageDto();
// try {
// dto.setFmId(fmId);
// dto.setOrderId(orderId);
// dto.setPartnerId(partnerId);
// dto.setStoreId(storeId);
// dto.setPayChannelType(payChanelType);
// dto.setTrackingNo(LogThreadLocal.getTrackingNo());
// paymentQueueService.paymentCallback(dto);
// } catch (Exception e) {
// log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
// }
//}
/**
* 获取预支付成功，将信息放入死心队列，当支付成功没有回掉的时候处理
*
* @param partnerId
* @param storeId
* @param fmId
* @param orderId
*/
public void putDelMq(String partnerId, String storeId, String fmId, String orderId,Integer payChanelType) {
PaymentMqMessageDto dto = new PaymentMqMessageDto();
try {
dto.setFmId(fmId);
dto.setOrderId(orderId);
dto.setPartnerId(partnerId);
dto.setStoreId(storeId);
dto.setPayChannelType(payChanelType);
dto.setTrackingNo(LogThreadLocal.getTrackingNo());
paymentQueueService.paymentCallback(dto);
} catch (Exception e) {
log.info("paymentQueueService.paymentCallback" + dto + " error" + e);
}
}
@Override
public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {
OrderBean orderBean = orderBeans.get(OrderBeanType.SAASORDER.getCode());
......@@ -440,13 +439,6 @@ public class OrderServiceImpl implements Orderservice {
}
//若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
// couponActivityService.callbackNotify(orderBean);
// 核销券码成功才能支付成功
BaseResponse baseResponse = verificationCoupon(message.getTrans_id());
if (!Objects.equals(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
// 核销失败
log.error("核销券码失败transId:{},message:{}", message.getTrans_id(), baseResponse.getMessage());
return newSendPayFaileMessage();
}
// 订单失败后 发消息重试 待实现
String takeCode;
String daySeq;
......@@ -468,6 +460,16 @@ public class OrderServiceImpl implements Orderservice {
if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
}
/*
ShoppingCartGoodsDto.SendPoint value = (ShoppingCartGoodsDto.SendPoint)redisCache.getValue(RedisKeyConstant.KGD_SENDPOINT_ORDERID + var1.getOrderId());
if (value != null){
var1.setSendPointActivityCode(value.getActivityCode());
var1.setSendPointEndTime(value.getEndTime());
var1.setSendPointMaxNum(value.getMaxNum());
var1.setSendPointSendPoint(value.getSendPoint());
var1.setSendPointValidityDateDays(value.getValidityDateDays());
}
*/
// 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
String string2 = JSONObject.toJSONString(payAccessRes);
......@@ -3123,80 +3125,6 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.success(responses.getData());
}
///**
// * 创建预支付订单
// */
//public BaseResponse createCombpayOrder(CreatePrepayRequestDto createPrepayRequestDto) {
// CreateOrderResponseVo createOrderResponse;
// OrderPayResponse orderPayResponse = null;
// PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
// long totalAmount = createPrepayRequestDto.getTotalAmount();
// String cardCode = createPrepayRequestDto.getCardCode();
// if (totalAmount < 0) {
// throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
// }else{
// String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
// orderPayResponse = comPayOrder(createPrepayRequestDto.getOrderPayItemCreateReqList(),createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(),createPrepayRequestDto.getCardAmount(),partnerPayOvertime);
// }
// if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
// return failPreOrderPay(LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getProductOrderBean(), cardCode, createPrepayRequestDto.getOrderClient(),
// Objects.isNull(orderPayResponse) ? null : orderPayResponse.getMsg());
// }
// createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, createPrepayRequestDto.getProductOrderBean());
// BaseResponse baseEditResponse = this.updateOrderInfo(orderPayResponse, createPrepayRequestDto.getOrderExtInfoDTO(), createPrepayRequestDto.getProductOrderBean(), LogThreadLocal.getTrackingNo());
// if (baseEditResponse != null) {
// return baseEditResponse;
// }
// if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
// createOrderResponse.setPaySuccess(false);
// } else {
// createOrderResponse.setPaySuccess(true);
// }
// // 推荐优惠插件用户下单数据上报
// if (!createOrderResponse.getPaySuccess()) {
// return ResponseUtil.success(createOrderResponse);
// } else {
// //如果是商品券支付0元，调用回调接口
// PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
// message.setResult_code(100);
// message.setOut_trade_no(createOrderResponse.getFmId());
// message.setTrans_id(createOrderResponse.getOid());
// message.setTotal_fee(0);
// message.setOpenid(createPrepayRequestDto.getOpenId());
// message.setPlatform_coupon(0);
// message.setMerchant_coupon(0);
// orderAdapterService.paySuccessCallback(message);
// return ResponseUtil.success(createOrderResponse);
// }
//}
//
//public OrderPayResponse comPayOrder(List<OrderPayItemCreateReq> orderPayItemCreateReqList, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String partnerPayOvertime) {
//
// OrderPayResponse orderPayResponse;
// try {
// //微信或者支付宝支付
// UnifiedOrderApplicationRequest request = orderAdapter.convent2CombPayOrderRequest(orderPayItemCreateReqList,orderBean, paymentRequest, orderBean.getAmount(), cardAmount, partnerPayOvertime);
// UnifiedOrderApiResponse responseBase = paymentApplicationClient.unifiedOrder(request,orderBean.getCompanyId());
// if (!ResponseCodeConstant.RESPONSE_SUCCESS.equals(responseBase.getCode())) {
// log.error("混合支付返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
// orderPayResponse = new OrderPayResponse();
// orderPayResponse.setMsg(responseBase.getMessage());
// } else {
// putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getFmTradeNo(), orderBean.getOid());
// orderPayResponse = orderAdapter.convent2OrderCombPayResponse(responseBase);
// orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
// orderPayResponse.setOpenId(paymentRequest.getOpenId());
// orderPayResponse.setPartnerId(orderBean.getCompanyId());
// orderPayResponse.setOrderId(orderBean.getOid());
// }
// } catch (Exception e) {
// LogUtil.error("comPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
// //TODO 邮件告警
// orderPayResponse = new OrderPayResponse();
// orderPayResponse.setMsg("comPay_error");
// }
// return orderPayResponse;
//}
public String getMealCodeRule(String appId){
String mealCodeRule = "";
......
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