From 55c8b48716cb69c33543d48fa09cd5a3dcd506c4 Mon Sep 17 00:00:00 2001 From: tangfang <2578400678@qq.comm> Date: Wed, 14 Jun 2023 10:04:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jar/US_export_policy.jar | Bin 0 -> 5373 bytes jar/local_policy.jar | Bin 0 -> 5372 bytes prod4.cmd | 4 +++ .../douyin/service/DouyinRefundService.java | 3 +-- .../service/impl/DouyinRefundServiceImpl.java | 24 +++++++---------- .../douyin/web/DouyinRefundController.java | 6 +---- .../DistributionCheckBackHandleDouyin.java | 5 ++-- ...DistributionCheckBackHandleOrderOther.java | 5 ++++ .../service/impl/FinanceServiceImpl.java | 2 ++ .../impl/PayPayedBackHandleOrderOtherV2.java | 11 ++++++-- .../start/impl/PayOrderClearServiceImpl.java | 10 ++++--- .../start/impl/PayPayedStartCheckStatus.java | 3 ++- .../handle/PayRefundBackHandleOrderOther.java | 4 +++ .../sync/impl/OrderRefundSyncOrderOther.java | 4 +++ ...derRefundTicketInitMoneyDetailSuccess.java | 8 ------ .../other/OrderRefundTicketOtherPd.java | 8 ++++++ .../impl/OrderTicketFinishHandleNoticeDy.java | 25 ++++++++++-------- .../OrderTicketFinishHandleOrderOther.java | 5 ++++ 18 files changed, 78 insertions(+), 49 deletions(-) create mode 100644 jar/US_export_policy.jar create mode 100644 jar/local_policy.jar diff --git a/jar/US_export_policy.jar b/jar/US_export_policy.jar new file mode 100644 index 0000000000000000000000000000000000000000..8f90d476fdd4e650921a697307344ee2c6cdaab3 GIT binary patch literal 5373 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 GuKo)HQCHId literal 0 HcmV?d00001 diff --git a/jar/local_policy.jar b/jar/local_policy.jar new file mode 100644 index 0000000000000000000000000000000000000000..5b0c3e320422d6d81e5e2ecc0d4cef98d9e6be55 GIT binary patch literal 5372 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 QY68@SjXLfe>DAM}0Py}|ga7~l literal 0 HcmV?d00001 diff --git a/prod4.cmd b/prod4.cmd index e9e1d95d..3e74ecc6 100644 --- a/prod4.cmd +++ b/prod4.cmd @@ -20,6 +20,10 @@ SET SH=%SH% docker run --name %SH_NAME%-3 -it -d --restart always SET SH=%SH% -v /home/other/home/pangd/conf:/home/java/conf/ -v /home/other/home/cache/:/home/cache/ -v /home/other/home/pangd/:/home/pangd/ --net pd SET SH=%SH% %SH_NAME%:latest --spring.profiles.active=prod --yzg.config.url=/home/java/conf/pd_all.properties; +SET DC=COPY ./jar/local_policy.jar /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/; +SET DC=%DC%COPY ./jar/US_export_policy.jar /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/ + + if 1 equ 1 ( java_docker -dn "%SH_NAME%" -ssh root@spd1 -sh "%SH%" diff --git a/src/main/java/com/pangding/web/douyin/service/DouyinRefundService.java b/src/main/java/com/pangding/web/douyin/service/DouyinRefundService.java index dc7c21c0..7e643579 100644 --- a/src/main/java/com/pangding/web/douyin/service/DouyinRefundService.java +++ b/src/main/java/com/pangding/web/douyin/service/DouyinRefundService.java @@ -1,10 +1,9 @@ package com.pangding.web.douyin.service; -import com.pangding.web.vo.douyin.V2.refund.req.DyRefundCallbackReqVo; import com.pangding.web.vo.douyin.V2.refund.res.DyRefundCallBackResVo; public interface DouyinRefundService { - DyRefundCallBackResVo payBack(DyRefundCallbackReqVo req, long timestamp, String nonce, String signature); + DyRefundCallBackResVo payBack(String body, long timestamp, String nonce, String signature); } diff --git a/src/main/java/com/pangding/web/douyin/service/impl/DouyinRefundServiceImpl.java b/src/main/java/com/pangding/web/douyin/service/impl/DouyinRefundServiceImpl.java index 0d4ce9e7..e750822b 100644 --- a/src/main/java/com/pangding/web/douyin/service/impl/DouyinRefundServiceImpl.java +++ b/src/main/java/com/pangding/web/douyin/service/impl/DouyinRefundServiceImpl.java @@ -7,6 +7,7 @@ import com.pangding.web.mq.OrderProducer; import com.pangding.web.order.dao.OrderDao; import com.pangding.web.order.service.ret.ticket.OrderRefundTicketService; import com.pangding.web.util.DouyinDealSignUtil; +import com.pangding.web.util.NewRasUtil; import com.pangding.web.vo.applet.req.AppletReqVo; import com.pangding.web.vo.applet.res.AppletResVo; import com.pangding.web.vo.douyin.V2.pay.res.DyBackResVo; @@ -43,28 +44,27 @@ public class DouyinRefundServiceImpl implements DouyinRefundService { @Override - public DyRefundCallBackResVo payBack(DyRefundCallbackReqVo req, long timestamp, String nonce, String signature) { + public DyRefundCallBackResVo payBack(String body, long timestamp, String nonce, String signature) { DyRefundCallBackResVo dyBaseResVo = new DyRefundCallBackResVo(); + DyRefundCallbackReqVo req = JsonHelper.deserialize(body, DyRefundCallbackReqVo.class); try { - String version = req.getVersion(); - String msg = req.getMsg(); - System.out.println("抖音退票回调3：" + msg); JSONObject jsonObject = JsonHelper.deserialize(msg, JSONObject.class); - String appid = jsonObject.getString("app_id"); - AppletResVo appletResVo = getAppletInfo(appid); if (StringHelper.isEmpty(appletResVo)) { dyBaseResVo.setErr_no(500); dyBaseResVo.setErr_tips("appid不正确"); return dyBaseResVo; } - boolean sign = true; - //DouyinDealSignUtil.verify(JsonHelper.serialize(req), appletResVo.getAppletsPublicKey(), signature, timestamp, nonce); - System.out.println("抖音退票回调1：" + sign); + StringBuffer buffer = new StringBuffer(); + buffer.append(timestamp).append("\n"); + buffer.append(nonce).append("\n"); + buffer.append(body).append("\n"); + String message = buffer.toString(); + boolean sign = NewRasUtil.verify(message, appletResVo.getPublicKey(), signature); if (sign) { // 签名相等 //调支付回调接口 @@ -78,7 +78,6 @@ public class DouyinRefundServiceImpl implements DouyinRefundService { double money = CalcHelper.div(new BigDecimal(pdRefundMoney).doubleValue(), 100); orderRefundReqVo.setPdRefundMoney(money); - OrderResVo orderResVo = orderDao.load(orderId, OrderResVo.class); if (StringHelper.isEmpty(orderResVo)) { throw new CodeException("100", "订单不存在"); @@ -105,17 +104,12 @@ public class DouyinRefundServiceImpl implements DouyinRefundService { JsonHelper.serialize(req), JsonHelper.serialize(req), "", ""); orderProducer.saveOrderLog(orderLogReqVo); } else { - System.out.println("抖音退票回调5：签名不正确"); dyBaseResVo.setErr_no(500); dyBaseResVo.setErr_tips("签名不正确"); } } catch (Exception e) { - System.out.println("抖音退票回调4：" + e); dyBaseResVo.setErr_no(500); dyBaseResVo.setErr_tips("抖音退票回调"); - OrderLogReqVo orderLogReqVo = new OrderLogReqVo(StringHelper.getNewID(), "", "DY:抖音退票回调", - JsonHelper.serialize(req), JsonHelper.serialize(req), "", ""); - orderProducer.saveOrderLog(orderLogReqVo); } System.out.println("抖音退票回调返回：" + JsonHelper.serialize(dyBaseResVo)); return dyBaseResVo; diff --git a/src/main/java/com/pangding/web/douyin/web/DouyinRefundController.java b/src/main/java/com/pangding/web/douyin/web/DouyinRefundController.java index b010e6fb..626303a5 100644 --- a/src/main/java/com/pangding/web/douyin/web/DouyinRefundController.java +++ b/src/main/java/com/pangding/web/douyin/web/DouyinRefundController.java @@ -1,12 +1,8 @@ package com.pangding.web.douyin.web; import com.pangding.web.douyin.service.DouyinRefundService; -import com.pangding.web.vo.douyin.V2.refund.req.DyRefundCallbackReqVo; import com.pangding.web.vo.douyin.V2.refund.res.DyRefundCallBackResVo; -import com.pangding.web.vo.douyin.res.DyBaseResVo; -import com.yanzuoguang.util.helper.CheckerHelper; import com.yanzuoguang.util.helper.JsonHelper; -import com.yanzuoguang.util.vo.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.MediaType; @@ -30,7 +26,7 @@ public class DouyinRefundController { @RequestMapping(value = "/refundTicket") @ApiOperation(value = "订单退票操作", notes = "返回退票结果") - public DyRefundCallBackResVo refundTicket(@RequestBody DyRefundCallbackReqVo req, HttpServletRequest request) { + public DyRefundCallBackResVo refundTicket(@RequestBody String req, HttpServletRequest request) { long timestamp = Long.valueOf(request.getHeader("Byte-Timestamp")); String nonce = request.getHeader("Byte-Nonce-Str"); diff --git a/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleDouyin.java b/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleDouyin.java index 4563cfda..8d1a0a42 100644 --- a/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleDouyin.java +++ b/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleDouyin.java @@ -14,6 +14,7 @@ import com.pangding.web.vo.order.req.back.CheckBackReqVo; import com.pangding.web.vo.order.res.OrderDetailResVo; import com.pangding.web.vo.order.res.OrderResVo; import com.yanzuoguang.util.base.ObjectHelper; +import com.yanzuoguang.util.helper.JsonHelper; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -51,7 +52,7 @@ public class DistributionCheckBackHandleDouyin implements DistributionCheckBackH dyPushDeliveryMqReqVo.setOut_order_no(order.getId()); DyPushDeliveryItemOrderReqVo dyPushDeliveryItemOrderReqVo = new DyPushDeliveryItemOrderReqVo(); - dyPushDeliveryItemOrderReqVo.setItemOrderId(order.getAlipayOrderId()); + dyPushDeliveryItemOrderReqVo.setItem_order_id(order.getAlipayOrderId()); List itemOrderReqVoList = new ArrayList<>(); itemOrderReqVoList.add(dyPushDeliveryItemOrderReqVo); @@ -63,7 +64,7 @@ public class DistributionCheckBackHandleDouyin implements DistributionCheckBackH dyPushDeliveryPoiInfoReqVo.setExt_valid_shop_id(order.getMerchantId()); dyPushDeliveryPoiInfoReqVo.setValid_poi_id_str("6601124056546674691"); - dyPushDeliveryMqReqVo.setPoi_info(dyPushDeliveryPoiInfoReqVo); + dyPushDeliveryMqReqVo.setPoi_info(JsonHelper.serialize(dyPushDeliveryPoiInfoReqVo)); temp.getPushDeliveryMqReqVos().add(dyPushDeliveryMqReqVo); diff --git a/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleOrderOther.java b/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleOrderOther.java index 1b40ef64..13e93bcb 100644 --- a/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleOrderOther.java +++ b/src/main/java/com/pangding/web/order/service/check/finish/impl/DistributionCheckBackHandleOrderOther.java @@ -1,5 +1,6 @@ package com.pangding.web.order.service.check.finish.impl; +import com.pangding.web.constant.OrderConstant; import com.pangding.web.order.service.check.finish.DistributionCheckBackHandle; import com.pangding.web.order.service.check.finish.DistributionCheckBackTempVo; import com.pangding.web.order.service.pay.payingback.PayPayingBackHandle; @@ -23,6 +24,10 @@ public class DistributionCheckBackHandleOrderOther implements DistributionCheckB @Override public void distributionCheckBack(DistributionCheckBackTempVo temp, OrderResVo order, CheckBackReqVo backReq, OrderCheckReqVo req) { + if(OrderConstant.PAY_METHOD_DOUYIN == order.getPayType() + || OrderConstant.PAY_METHOD_WECHAT == order.getPayType()){ + return; + } // todo: 可能参数有点少，这里可以把第二个参数改成自己想要的实体 temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), backReq)); } diff --git a/src/main/java/com/pangding/web/order/service/impl/FinanceServiceImpl.java b/src/main/java/com/pangding/web/order/service/impl/FinanceServiceImpl.java index 8bb7c6da..db28c49f 100644 --- a/src/main/java/com/pangding/web/order/service/impl/FinanceServiceImpl.java +++ b/src/main/java/com/pangding/web/order/service/impl/FinanceServiceImpl.java @@ -158,6 +158,7 @@ public class FinanceServiceImpl implements FinanceService { int categoryType, double refundFee, OrderRefundVo orderRefundVo) { // 添加资金流水 CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo(); + capitalFlowReqVo.setOrderId(orderMoneyDetailVo.getOrderId()); capitalFlowReqVo.setMerchantName(orderResVo.getMerchantName()); capitalFlowReqVo.setProductName(orderResVo.getProductName()); @@ -191,6 +192,7 @@ public class FinanceServiceImpl implements FinanceService { capitalFlowReqVo.setTime(DateHelper.getNow()); capitalFlowReqVo.setOrderTime(orderResVo.getOrderTime()); capitalFlowReqVo.setPlayDate(orderResVo.getPlayDate()); + capitalFlowReqVo.setTempId(StringHelper.getMD5Id(capitalFlowReqVo.getOrderId(), capitalFlowReqVo.getOrderMonetDetailId())); //调用户修改公司余额 orderTempProcedure.saveCapitalFlow(capitalFlowReqVo); } diff --git a/src/main/java/com/pangding/web/order/service/pay/payed/backV2/impl/PayPayedBackHandleOrderOtherV2.java b/src/main/java/com/pangding/web/order/service/pay/payed/backV2/impl/PayPayedBackHandleOrderOtherV2.java index 79eb23b1..f8ede4eb 100644 --- a/src/main/java/com/pangding/web/order/service/pay/payed/backV2/impl/PayPayedBackHandleOrderOtherV2.java +++ b/src/main/java/com/pangding/web/order/service/pay/payed/backV2/impl/PayPayedBackHandleOrderOtherV2.java @@ -1,5 +1,6 @@ package com.pangding.web.order.service.pay.payed.backV2.impl; +import com.pangding.web.constant.OrderConstant; import com.pangding.web.order.service.pay.payed.backV2.PayPayedBackHandleV2; import com.pangding.web.order.service.pay.payed.backV2.PayPayedBackTempVoV2; import com.pangding.web.vo.base.OrderOtherHandleReqVo; @@ -20,7 +21,13 @@ public class PayPayedBackHandleOrderOtherV2 implements PayPayedBackHandleV2 { @Override public void payPayedHandle(PayPayedBackTempVoV2 temp, PayedBackReqVo req, OrderResVo order, OrderMoneyDetailVo orderMoneyDetailVo, OrderCheckDetailVo orderCheckDetailVo) { - // todo: 可能参数有点少，这里可以把第二个参数改成自己想要的实体 - temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), orderCheckDetailVo)); + + if (OrderConstant.PAY_METHOD_WECHAT == order.getPayType() + || OrderConstant.PAY_METHOD_DOUYIN == order.getPayType()) { + return; + } + + // todo: 可能参数有点少，这里可以把第二个参数改成自己想要的实体 + temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), orderCheckDetailVo)); } } diff --git a/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayOrderClearServiceImpl.java b/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayOrderClearServiceImpl.java index c25081e0..be64a00a 100644 --- a/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayOrderClearServiceImpl.java +++ b/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayOrderClearServiceImpl.java @@ -72,10 +72,14 @@ public class PayOrderClearServiceImpl implements PayOrderClearService { // for(OrderMoneyDetailVo orderMoneyDetailVo: orderMoneyDetailList){ // temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), orderMoneyDetailVo)); // } - - for(OrderCheckDetailVo orderCheckDetailVo: orderCheckDetailResVoList){ - temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), orderCheckDetailVo)); + if(OrderConstant.PAY_METHOD_DOUYIN != orderStatus.getPayType() + && OrderConstant.PAY_METHOD_WECHAT != orderStatus.getPayType()){ + // 抖音支付或者微信支付的订单不需要进入报表 + for(OrderCheckDetailVo orderCheckDetailVo: orderCheckDetailResVoList){ + temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), orderCheckDetailVo)); + } } + temp.getLogs().add(createLock.getLog(order.getId(), "订单资金代付", JsonHelper.serialize(payedOrder), "已发起订单资金代付MQ")); } diff --git a/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayPayedStartCheckStatus.java b/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayPayedStartCheckStatus.java index 22831d09..fa3139ac 100644 --- a/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayPayedStartCheckStatus.java +++ b/src/main/java/com/pangding/web/order/service/pay/payed/start/impl/PayPayedStartCheckStatus.java @@ -28,7 +28,8 @@ public class PayPayedStartCheckStatus implements PayPayedStartCheck { if (OrderConstant.ORDER_STATUS_ALL_REFUND == orderStatus) { throw new CodeException("20006", "订单已退款" + orderStatus); } - if (OrderConstant.PAY_METHOD_DOUYIN >= order.getPayType()) { + if (OrderConstant.PAY_METHOD_DOUYIN == order.getPayType() + || OrderConstant.PAY_METHOD_WECHAT == order.getPayType()) { throw new CodeException("20006", "订单不是通联支付，不用代付。" + order.getPayType()); } } diff --git a/src/main/java/com/pangding/web/order/service/pay/refundback/handle/PayRefundBackHandleOrderOther.java b/src/main/java/com/pangding/web/order/service/pay/refundback/handle/PayRefundBackHandleOrderOther.java index cfa50cb6..fdf45036 100644 --- a/src/main/java/com/pangding/web/order/service/pay/refundback/handle/PayRefundBackHandleOrderOther.java +++ b/src/main/java/com/pangding/web/order/service/pay/refundback/handle/PayRefundBackHandleOrderOther.java @@ -25,6 +25,10 @@ public class PayRefundBackHandleOrderOther implements PayRefundBackHandle { if (OrderConstant.REFUND_SOURCE_SYSTEM == refundHis.getRefundSource()) { return; } + if(OrderConstant.PAY_METHOD_WECHAT == order.getPayType() + || OrderConstant.PAY_METHOD_DOUYIN == order.getPayType()){ + return; + } temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), refundHis)); } } diff --git a/src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderRefundSyncOrderOther.java b/src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderRefundSyncOrderOther.java index 011b7451..7c1ef460 100644 --- a/src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderRefundSyncOrderOther.java +++ b/src/main/java/com/pangding/web/order/service/ret/sync/impl/OrderRefundSyncOrderOther.java @@ -36,6 +36,10 @@ public class OrderRefundSyncOrderOther implements OrderReturnSyncHandle { if (OrderConstant.REFUND_STATUS_TICKET_BACK_OK != refundStatus) { return; } + if(OrderConstant.PAY_METHOD_DOUYIN == order.getPayType() + || OrderConstant.PAY_METHOD_WECHAT == order.getPayType()){ + return; + } temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), req)); } } diff --git a/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketInitMoneyDetailSuccess.java b/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketInitMoneyDetailSuccess.java index d556418f..bae0e809 100644 --- a/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketInitMoneyDetailSuccess.java +++ b/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketInitMoneyDetailSuccess.java @@ -79,18 +79,10 @@ public class OrderRefundTicketInitMoneyDetailSuccess implements OrderRefundTicke refund.setSysRefundMoney(getDoubleWithLongMinute(feeAmount)); -// int refundType1 = StringHelper.toInt(req.getRefundType()); -// double refundMoney = StringHelper.toDouble(req.getRefundMoney()); -// boolean isRefundDetail = 0 == refundType1 || refundMoney > 0; -// if (!isRefundDetail) { -// return; -// } // 找到订单资金明细 List orderMoneyDetailList = getMoneyDetail(order); -// List orderRefundDetailVoList = new ArrayList<>(); - for (OrderMoneyDetailVo orderMoneyDetailResVo : orderMoneyDetailList) { OrderRefundDetailVo refundDetailVo = new OrderRefundDetailVo(); diff --git a/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketOtherPd.java b/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketOtherPd.java index 5bbd6186..e901cc1c 100644 --- a/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketOtherPd.java +++ b/src/main/java/com/pangding/web/order/service/ret/ticket/other/OrderRefundTicketOtherPd.java @@ -50,6 +50,14 @@ public class OrderRefundTicketOtherPd implements OrderRefundTicketOther { return; } + if (OrderConstant.SUB_ORDER_TYPE_SWEEP_CODE_PAY == order.getSubOrderType()) { + // 扫码牌直接退票成功 + OrderRefundVo refund = temp.getRefund(); + refund.setRefundStatus(OrderConstant.REFUND_STATUS_TICKET_BACK); + temp.getRefunds().add(temp.getRefund()); + return; + } + // 胖丁是否出票失败 boolean isFair = OrderRefundTicketUtil.isFair(order); if (isFair) { diff --git a/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleNoticeDy.java b/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleNoticeDy.java index 3dd1509a..5e613045 100644 --- a/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleNoticeDy.java +++ b/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleNoticeDy.java @@ -21,18 +21,21 @@ public class OrderTicketFinishHandleNoticeDy implements OrderTicketFinishHandle @Override public void createOrderBack(OrderTicketFinishTempVo temp, OrderResVo order, DistributionOrderReqVo item) { - DyBookResultPdReqVo dyBookResultPdReqVo = new DyBookResultPdReqVo(); - dyBookResultPdReqVo.setAppid(order.getUserIp()); - dyBookResultPdReqVo.setBook_id(order.getBookId()); - if(OrderConstant.ORDER_STATUS_SUCCESS == item.getOrderStatusVo().getOrderStatus()){ - dyBookResultPdReqVo.setResult(1); - }else if(OrderConstant.ORDER_STATUS_FAIL == item.getOrderStatusVo().getOrderStatus()){ - dyBookResultPdReqVo.setResult(2); - dyBookResultPdReqVo.setMsg("出票失败"); - }else{ - return; + if(OrderConstant.PAY_METHOD_DOUYIN == order.getPayType()){ + DyBookResultPdReqVo dyBookResultPdReqVo = new DyBookResultPdReqVo(); + dyBookResultPdReqVo.setAppid(order.getUserIp()); + dyBookResultPdReqVo.setBook_id(order.getBookId()); + if(OrderConstant.ORDER_STATUS_SUCCESS == item.getOrderStatusVo().getOrderStatus()){ + dyBookResultPdReqVo.setResult(1); + }else if(OrderConstant.ORDER_STATUS_FAIL == item.getOrderStatusVo().getOrderStatus()){ + dyBookResultPdReqVo.setResult(2); + dyBookResultPdReqVo.setMsg("出票失败"); + }else{ + return; + } + temp.getBookResults().add(dyBookResultPdReqVo); } - temp.getBookResults().add(dyBookResultPdReqVo); + // List distributionOrderReqVoList = item.getSubDistributionOrderReqVoList(); // for(DistributionOrderReqVo distributionOrderReqVo: distributionOrderReqVoList){ diff --git a/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleOrderOther.java b/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleOrderOther.java index 10ecefb0..31ad32e3 100644 --- a/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleOrderOther.java +++ b/src/main/java/com/pangding/web/order/service/ticket/finish/impl/OrderTicketFinishHandleOrderOther.java @@ -18,6 +18,11 @@ public class OrderTicketFinishHandleOrderOther implements OrderTicketFinishHandl @Override public void createOrderBack(OrderTicketFinishTempVo temp, OrderResVo order, DistributionOrderReqVo item) { + if(OrderConstant.PAY_METHOD_DOUYIN == order.getPayType() + || OrderConstant.PAY_METHOD_WECHAT == order.getPayType()){ + // 抖音支付或者微信支付的订单不需要进入报表 + return; + } // todo: 可能参数有点少，这里可以把第二个参数改成自己想要的实体 if(OrderConstant.ORDER_STATUS_SUCCESS == item.getOrderStatusVo().getOrderStatus()){ temp.getOrderOthers().add(new OrderOtherHandleReqVo<>(order.getId(), item));