取消新人免单券奖励

yujian

2020-06-29 e4c7f45ed5a06512fa9981ef63d256e950b433c8

取消新人免单券奖励

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -696,4 +696,18 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



	
    /**

     * 获取注销协议

     * @param acceptData

     * @param uid

     * @param type

     * @param out

     */

    @RequestMapping(value = "getLogoutProtocol")

    public void getLogoutProtocol(String callback, AcceptData acceptData,PrintWriter out) {

        JSONObject data = new JSONObject();

        data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));

        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -150,6 +150,7 @@
    userProtocolHomeData("user_protocol_home_data", "用户协议首页内容"),
    serviceProtocolLink("service_protocol_link", "服务协议"),
    privacyProtocolLink("privacy_protocol_link", "隐私协议"),
    accountLogoutProtocolLink("account_logout_protocol_link", "账户注销协议"),

    shareOpenJD("share_jd_open", "京东商品是否开启分享"),
    jdApiSearchKey("jd_api_search_key", "京东API是否搜索"),

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java

@@ -58,22 +58,22 @@
                    LogHelper.errorDetailInfo(e);

                }

                

                // 发送48小时延时消息

                boolean verifyOrder = redPackWinInviteService.verifyOrder(mqMsg.getUid(), mqMsg.getOrderId(), mqMsg.getType(), mqMsg.getPlaceTime());

                if (verifyOrder) {

                    int hour = 48;

                    if (Constant.IS_TEST) {

                        hour = 1;

                    }

                    mqMsg.setDelayHour(hour);

                    Message msg = new Message(message.getTopic(), OrderTopicTagEnum.orderStatisticDelay.name(),

                            new Gson().toJson(mqMsg).getBytes());

                    if (mqMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour > System.currentTimeMillis())// 时间是否已经过了

                        msg.setStartDeliverTime(mqMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour);

                    else

                        msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);

                    producer.send(msg);

                }

//                // 发送48小时延时消息

//                boolean verifyOrder = redPackWinInviteService.verifyOrder(mqMsg.getUid(), mqMsg.getOrderId(), mqMsg.getType(), mqMsg.getPlaceTime());

//                if (verifyOrder) {

//                    int hour = 48;

//                    if (Constant.IS_TEST) {

//                        hour = 1;

//                    }

//                    mqMsg.setDelayHour(hour);

//                    Message msg = new Message(message.getTopic(), OrderTopicTagEnum.orderStatisticDelay.name(),

//                            new Gson().toJson(mqMsg).getBytes());

//                    if (mqMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour > System.currentTimeMillis())// 时间是否已经过了

//                        msg.setStartDeliverTime(mqMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour);

//                    else

//                        msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);

//                    producer.send(msg);

//                }

                return Action.CommitMessage;

            } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 订单统计

                OrderMQMsg mqMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);

@@ -82,14 +82,14 @@
                    hour = 1;

                }



                if (mqMsg.getDelayHour() == hour) {

                    try {

                        redPackWinInviteService.winFreeCoupon(mqMsg.getUid(), mqMsg.getOrderId(), mqMsg.getType(), mqMsg.getPlaceTime());

                    } catch (Exception e) {

                        LogHelper.errorDetailInfo(e);

                        return Action.ReconsumeLater;

                    }

                }

//                if (mqMsg.getDelayHour() == hour) {

//                    try {

//                        redPackWinInviteService.winFreeCoupon(mqMsg.getUid(), mqMsg.getOrderId(), mqMsg.getType(), mqMsg.getPlaceTime());

//                    } catch (Exception e) {

//                        LogHelper.errorDetailInfo(e);

//                        return Action.ReconsumeLater;

//                    }

//                }

                return Action.CommitMessage;

            }

        }


 fanli/src/main/resource/rocket/consumer.xml

@@ -360,7 +360,7 @@
                    <key>

                       <bean class="com.aliyun.openservices.ons.api.bean.Subscription">

                         <property name="topic" value="TOPIC_ORDER" />

                         <property name="expression"  value="orderStatistic||orderStatisticDelay" />

                         <property name="expression"  value="orderStatistic" />

                       </bean>

                    </key>

                 </entry>