Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-14 e378405bd2968d78d1ddf43b5e326f19d39fa4a3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderService.java

@@ -124,4 +124,11 @@
     * @return  发货结果
     */
    R orderDeliver(OrderDeliverAdminDto deliverAdminDto);

    /**
     * 电动车商城购买活动商品支付回调
     * @param notifyOrderDTO    请求参数
     * @return  购买商品支付回调
     */
    R batteryActivityPayNotify(WxPayNotifyOrderDTO notifyOrderDTO);
}