邀请界面修改

admin

2019-01-07 64c42ddcca9a13af0b06e6565f192e2efc3f11e5

邀请界面修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java

@@ -154,15 +154,13 @@
        } catch (SwiperPictureException e) {

            e.printStackTrace();

        }

		


        data.put("desc", configService.get("invite_desc"));

		


        com.alibaba.fastjson.JSONObject root = new com.alibaba.fastjson.JSONObject();

        root.put("code", 0);

        root.put("data", data);



        out.print(JsonUtil.loadTrue(0, root, "成功"));

        out.print(root.toString());

    }



    /**


 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java

@@ -225,6 +225,8 @@
        typeList.clear();

        typeList.add(UserMoneyDetailTypeEnum.invite);

        typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

        typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

		
        minDate = new Date(0L);

        maxDate = new Date(timeStamp);

        vo.setTotalInviteMoney(


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -966,7 +966,6 @@
                }

            } else {

                uid = oldOrder.getUserInfo().getId();



            }

            // 尚未找到和PID对应的用户

            if (uid == null)

@@ -990,6 +989,9 @@
                    thirdState = o.getOrderState();

                    break;

                }



            if (StringUtil.isNullOrEmpty(thirdState))

                thirdState = "订单失效";

            updateOrder.setThirdState(thirdState);

            updateOrder.setThirdCreateTime(

                    new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss")));