删除HongBaoService与相关依赖

admin

2019-03-13 f59827148e50dc0289a58a97762121dcffbfc849

删除HongBaoService与相关依赖

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -35,9 +35,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.ThreeSaleRank;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.system.CustomerContent;

import com.yeshi.fanli.entity.system.CustomerName;

@@ -68,7 +66,6 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

@@ -139,9 +136,6 @@
    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private UserInfoService userInfoService;



    @Resource

@@ -209,18 +203,6 @@
        return "coupon";

    }



    @RequestMapping("findThreeSaleInfo")

    public void findThreeSaleInfo(long id, PrintWriter out) {

        int count = threeSaleSerivce.findInviteCount(id);

        double money = hongBaoService.findThreeSaleMoney(id);

        List<ThreeSaleRank> list = threeSaleRankService.rank(5);

        JSONObject data = new JSONObject();

        data.put("count", count);

        data.put("money", money);

        data.put("list", list);

        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping("findThreeFriendsCount")

    public void findThreeFriendsCount(long id, String callback, PrintWriter out) {

        int count1 = userInfoService.findFriendsCount(id, 1);

@@ -257,15 +239,6 @@
        } else {

            out.print(JsonUtil.loadTrueResult(data));

        }

    }



    @RequestMapping("findThreeSales")

    public void findThreeSales(long id, PrintWriter out) {

        List<HongBao> list = hongBaoService.findThreeSaleHongBao(id);

        String json = JsonUtil.getApiCommonGson().toJson(list);

        JSONObject data = new JSONObject();

        data.put("list", json);

        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping(value = "getConpon", method = RequestMethod.POST)


 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -39,8 +39,6 @@
import com.yeshi.fanli.service.inter.count.ExtractCountService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.count.UserInfoCountService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.push.PushRecordService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

@@ -85,17 +83,12 @@
    private ExtractAuditRecordService extractAuditRecordService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private HongBaoV2CountService hongBaoV2CountService;



    @Resource

    private AdminUserService adminUserService;



    @Resource

    private OrderItemServcie orderItemServcie;

	


    @Resource

    private RedisManager redisManager;



@@ -104,6 +97,7 @@


    @Resource

    private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;

	


    private final static String TODAY = "1";

    private final static String THREE = "2";

@@ -445,7 +439,7 @@
                        UserInfo userInfo = extract.getUserInfo();

                        Long id = userInfo.getId();

                        countByUid = hongBaoService.getCountByUid(id);

                        countCancel = hongBaoService.getCountCancelByUid(id);

                        countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO); 
                    }

                    extractAuditRecord.setCancelOrderNum((long) countCancel);

                    extractAuditRecord.setOrderNum((long) countByUid);


 fanli/src/main/java/com/yeshi/fanli/controller/admin/HongBaoManageAdminController.java

@@ -10,14 +10,13 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoManage;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -31,8 +30,6 @@
    @Resource

    private HongBaoManageService hongBaoManageService;



    @Resource

    private HongBaoService hongBaoService;



    @RequestMapping(value = "updateHongBaoManage", method = RequestMethod.POST)

    public void updateHongBaoManage(String map, PrintWriter out) {

@@ -58,28 +55,5 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping(value = "getHongBaoList", method = RequestMethod.POST)

    public void getHongBaoList(int pageIndex, String state, PrintWriter out) {



        List<HongBao> list = hongBaoService.getHongBaoList(pageIndex - 1, state);



		
        JsonConfig jsonConfig = new JsonConfig(); // 建立配置文件

        jsonConfig.setIgnoreDefaultExcludes(false); // 设置默认忽略

        jsonConfig.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);

        JSONArray hongBaoList = JSONArray.fromObject(list, jsonConfig);



        int count = hongBaoService.getCount(state);

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

        Map<String, String> map = new HashMap<String, String>();

        map.put("state", state);

        pe.setParams(map);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("hongBaoList", hongBaoList);

        out.print(JsonUtil.loadTrueResult(data));

        return;

    }



}


 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java

@@ -8,9 +8,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -23,7 +20,6 @@
import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

@@ -33,6 +29,9 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.order.CommonOrderVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/order")

public class OrderAdminController {

@@ -40,8 +39,6 @@
    @Resource

    private OrderService orderService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private HongBaoV2CountService hongBaoV2CountService;

@@ -93,19 +90,6 @@
        }

    }

    

	


    @RequestMapping(value = "getOrderList", method = RequestMethod.POST)

    public void getOrderList(int pageIndex, String key, PrintWriter out) {

        List<OrderAdmin> orderAdminList = hongBaoService.getOrderAdminList(pageIndex, key);

        int count = orderService.getCount(key);

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("orderList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(orderAdminList));

        out.print(JsonUtil.loadTrueResult(data));

    }

    

    /**

     * 查询所有用户订单列表


 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -10,8 +10,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -24,7 +22,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

@@ -35,12 +32,12 @@
import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/upload")

public class UploadController {



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private OrderService orderService;


 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -37,9 +37,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.UserInfoCountService;

import com.yeshi.fanli.service.inter.goods.ShareService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ExtractService;

@@ -80,16 +78,10 @@
    private ConfigService configService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private ExtractService extractService;



    @Resource

    private ThreeSaleSerivce threeSaleService;



    @Resource

    private OrderItemServcie orderItemService;



    @Resource

    private ShareService shareService;


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java

@@ -21,7 +21,6 @@
import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;



import net.sf.json.JSONObject;

@@ -33,8 +32,6 @@
    @Resource

    private UserRankingsService userRankingsService;



    @Resource

    private HongBaoService hongBaoService;



    /**

     * 返利券排行榜


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

@@ -34,11 +34,9 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

@@ -79,8 +77,6 @@
    @Resource

    private OrderService orderService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private HongBaoV2Service hongBaoV2Service;

@@ -105,9 +101,6 @@


    @Resource

    private LostOrderService lostOrderService;



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private AccountMessageService accountMessageService;


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

@@ -43,7 +43,7 @@
import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractRecord;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoExtra;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.MoneyRecord;

import com.yeshi.fanli.entity.bus.user.OrderItem;

@@ -65,7 +65,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

@@ -76,15 +75,14 @@
import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

@@ -136,9 +134,6 @@
    private OrderService orderService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private MoneyRecordService moneyRecordService;



    @Resource

@@ -167,9 +162,6 @@


    @Resource

    private LostOrderService lostOrderService;



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private AccountMessageService accountMessageService;

@@ -221,6 +213,9 @@


    @Resource

    private AppVersionService appVersionService;



    @Resource

    private HongBaoV2CountService hongBaoV2CountService;



    private static final String PASSWORD_MAX_ERROR = "password_max_error";

    private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -503,10 +498,9 @@
    }



    private void outUserInfo(AcceptData acceptData, PrintWriter out, String remotIP, UserInfo user, String device) {

        BigDecimal MyTotalMoney = hongBaoService.getMyTotalHongBaoByUid(user.getId());

        user.setTotalHongBao(MyTotalMoney);

        BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());

        BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());

        user.setTotalHongBao(new BigDecimal(0));

        BigDecimal unOpenmoney = new BigDecimal(0);

        BigDecimal canOpenMoney = new BigDecimal(0);

        user.setNoOpenHongBao(unOpenmoney);

        user.setCanOpenHongBao(canOpenMoney);



@@ -755,62 +749,6 @@
        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

        data.put("moneyRecordList", gson.toJson(moneyRecordList));

        out.print(JsonUtil.loadTrueResult(data));

    }



    /**

     * 获取当前用户红包

     * 
     * @param acceptData

     * @param uid

     *            用户id

     * @param out

     * @throws ObjectStateException

     */

    @RequestMapping(value = "gethongbao", method = RequestMethod.POST)

    public void getHongBao(AcceptData acceptData, long uid, PrintWriter out) {

        UserInfo user = userInfoService.getUserById(uid);

        JSONObject data = new JSONObject();

        if (user == null) {

            data.put("count", 0);

            data.put("hongBaoList", new ArrayList());

            data.put("error", "用户不存在");

            out.print(JsonUtil.loadTrueResult(data));

            return;

        }

        List<HongBaoExtra> hongBaoList = hongBaoService.getHongBao(uid);



        if (hongBaoList.size() == 0) {

            data.put("count", 0);

            data.put("hongBaoList", hongBaoList);

            out.print(JsonUtil.loadTrueResult(data));

            return;

        }

        data.put("count", hongBaoList.size());

        data.put("hongBaoList", GsonUtil.toJsonExpose(hongBaoList));

        out.print(JsonUtil.loadTrueResult(data));

        return;

    }



    /**

     * 设置提现密码

     * 
     * @param acceptData

     * @param payPassword

     *            提现密码（要经过md5加密）

     * @param uid

     *            用户id

     * @param out

     */

    @RequestMapping(value = "setpaypassword", method = RequestMethod.POST)

    public void setPayPassword(AcceptData acceptData, String payPassword, long uid, PrintWriter out) {

        UserInfo user = userInfoService.getUserById(uid);

        if (user == null) {

            out.print(JsonUtil.loadFalseResult("用户不存在"));

            return;

        }

        user.setPayPassword(payPassword);

        userInfoService.update(user);

        out.print(JsonUtil.loadTrueResult("设置成功"));

    }



    /**

@@ -1454,21 +1392,6 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping(value = "openhongbao")

    public void openHongBao(AcceptData acceptData, long hid, HttpServletRequest request, PrintWriter out) {

        String ip = IPUtil.getRemotIP(request);

        HongBaoExtra hbx = hongBaoService.open(hid, ip);

        if (hbx == null) {

            out.print(JsonUtil.loadFalseResult("红包异常"));

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "] 打开红包[id=" + hid + "]失败！");

            return;

        }

        JSONObject data = new JSONObject();

        data.put("hongBao", GsonUtil.toJsonExpose(hbx));

        out.print(JsonUtil.loadTrueResult(data));

        LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "] 打开红包[id=" + hid + "]成功！");

    }



    @RequestMapping("findLostOrder")

    public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, PrintWriter out) {

        boolean orderNum = true;

@@ -1545,21 +1468,6 @@
        JSONObject data = new JSONObject();

        data.put("list", gson.toJson(orderItemList));

        data.put("count", count);

        out.print(JsonUtil.loadTrueResult(data));

    }



    @RequestMapping("getOrderItem")

    public void getOrderItem(AcceptData acceptData, long id, PrintWriter out) {

        OrderItem orderItem = orderItemServcie.getOne(id);

        if (orderItem == null) {

            out.print(JsonUtil.loadFalseResult("不存在该订单"));

            return;

        }

        orderItem.setDesc();

        JSONObject data = new JSONObject();

        GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

        Gson gson = gsonBuilder.excludeFieldsWithoutExposeAnnotation().create();

        data.put("orderItem", gson.toJson(orderItem));

        out.print(JsonUtil.loadTrueResult(data));

    }




 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -31,10 +31,8 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

@@ -63,9 +61,6 @@
    @Resource

    private OrderService orderService;



    @Resource

    private HongBaoService hongBaoService;







    @Resource

@@ -91,9 +86,6 @@


    @Resource

    private LostOrderService lostOrderService;



    @Resource

    private OrderItemServcie orderItemServcie;

    

    @Resource

    private AccountMessageService accountMessageService;

@@ -311,10 +303,10 @@
    }



    private void outUserInfo(PrintWriter out, String remotIP, UserInfo user, String device) {

        BigDecimal totalmoney = hongBaoService.getTotalHongBaoByUid(user.getId());

        BigDecimal totalmoney = new BigDecimal(0);

        user.setTotalHongBao(totalmoney);

        BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());

        BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());

        BigDecimal unOpenmoney = new BigDecimal(0);

        BigDecimal canOpenMoney = new BigDecimal(0);

        user.setNoOpenHongBao(unOpenmoney);

        user.setCanOpenHongBao(canOpenMoney);

        JSONObject data = new JSONObject();


 fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java

@@ -14,10 +14,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.DataMonitorService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

@@ -40,14 +38,7 @@
    }



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private OrderProcessService orderProcessService;



@@ -205,7 +196,7 @@
                - (1000 * 60 * 60 * 24L * (90 - pos));

        long endTime = startTime + 1000 * 60 * 60 * 24L;

        LogHelper.orderInfo("正在执行订单爬取...");

//        updateOrder(startTime, endTime);

        // updateOrder(startTime, endTime);

    }



    // 淘宝推广订单 每隔30秒执行一次


 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java

@@ -18,10 +18,8 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.DataMonitorService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

@@ -43,14 +41,9 @@
        System.out.println("初始化:UpdateOrderJob");

    }



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private OrderProcessService orderProcessService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java

File was deleted

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

File was deleted

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

@@ -43,7 +43,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

@@ -51,12 +50,10 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.PushService;

@@ -81,11 +78,6 @@
    @Resource

    private PidUserMapper pidUserMapper;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private OrderItemServcie orderItemService;



    @Resource

    private UserInfoMapper userInfoMapper;

@@ -545,11 +537,6 @@
                    new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));

        if (order.getJieSuanTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

            return;

        }

        try {

            orderService.failureOrderWithWeiQuan(order.getOrderId(), Order.ORDER_TYPE_TAOBAO);

        } catch (ObjectStateException e) {

            e.printStackTrace();

        }

    }




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

@@ -26,19 +26,12 @@
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.order.OrderDao;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.OrderItem;

import com.yeshi.fanli.entity.bus.user.ThreeSaleGift;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.ShareManageService;

import com.yeshi.fanli.util.Constant;

@@ -58,16 +51,10 @@
    private ShareManageService shareManageService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private ConfigService configService;



    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private OrderItemServcie orderItemService;



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;

@@ -328,64 +315,6 @@
        });

    }



    @Transactional(propagation = Propagation.REQUIRED)

    public void failureOrder(final String orderid, final int orderType) throws ObjectStateException {

        // 失效的订单

        List<Order> orderList = orderService.setOrderState(orderid, orderType);

        if (orderList != null && orderList.size() > 0) {

            for (Order order : orderList) {

                // 找到这个失效订单以前发的红包

                List<HongBao> hongBaoList = hongBaoService.findHongBaoByOrderList(order.getId());

                if (hongBaoList != null)

                    for (HongBao hongBao : hongBaoList)

                        // 把红包搞成失效的,分销的红包也要搞失效

                        hongBaoService.relevantInvalid(hongBao.getId());

            }

        }

    }



    @Transactional

    public void failureOrderWithWeiQuan(final String orderid, final int orderType) throws ObjectStateException {

        // 失效的订单

        List<Order> orderList = orderService.setOrderState(orderid, orderType);

        if (orderList != null && orderList.size() > 0) {

            for (Order order : orderList) {

                // if (order.getState() == Order.STATE_SHIXIAO)

                // continue;

                // 找到这个失效订单以前发的红包

                List<HongBao> hongBaoList = hongBaoService.findHongBaoByOrderList(order.getId());

                if (hongBaoList != null)

                    for (HongBao hongBao : hongBaoList)

                        // 把红包搞成失效的,分销的红包也要搞失效

                        hongBaoService.relevantInvalidVersion2(hongBao.getId());



                List<OrderItem> orderItremList = orderItemService.findByOrderId(order.getId());

                if (orderItremList != null)

                    for (OrderItem orderItem : orderItremList) {

                        OrderItem updateOrderItem = new OrderItem(orderItem.getId());



                        updateOrderItem.setState(OrderItem.STATE_TUIKUAN);

                        // 查询

                        List<ThreeSaleGift> giftList = threeSaleGiftService.findThreeSaleGiftList(orderItem.getId());

                        for (ThreeSaleGift tsg : giftList) {

                            if (tsg.getState().intValue() != OrderItem.STATE_DAOZHANG

                                    && tsg.getState().intValue() != OrderItem.STATE_SHOUHOU) {

                                ThreeSaleGift updateTsg = new ThreeSaleGift();

                                updateTsg.setId(tsg.getId());

                                updateTsg.setState(OrderItem.STATE_TUIKUAN);

                                threeSaleGiftMapper.updateByPrimaryKeySelective(updateTsg);

                            }

                        }

                        orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);

                    }

                Order updateOrder = new Order();

                updateOrder.setId(order.getId());

                updateOrder.setState(Order.STATE_SHIXIAO);

                orderMapper.updateByPrimaryKeySelective(updateOrder);

            }

        }

    }



    @Transactional

    public List<Order> setOrderState(final String orderid, final int orderType) {

        List<Order> orderList = orderMapper.selectOrderByOrderIdAndOrderType(orderid, orderType);

@@ -471,16 +400,6 @@
        List<Order> list = orderDao.list("from Order or where or.version=1");



        return list;

    }



    // 处理维权订单

    @Override

    public void update(TaoBaoWeiQuanOrder order) {

        try {

            failureOrderWithWeiQuan(order.getOrderId(), Order.ORDER_TYPE_TAOBAO);

        } catch (ObjectStateException e) {

            e.printStackTrace();

        }

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -43,7 +43,6 @@
import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

@@ -83,8 +82,6 @@
    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private AccountMessageMapper accountMessageMapper;

@@ -731,9 +728,6 @@
            updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName() + user.getId());

            userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);

        }



        // 添加新人红包

        hongBaoService.setNewUserHongBaoMyBatis(user, 1);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -44,7 +44,6 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

@@ -63,9 +62,6 @@


    @Resource

    private UserInfoService userInfoService;



    @Resource

    private HongBaoService hongBaoService;



    @Resource

    private ConfigService configService;

@@ -159,8 +155,6 @@
                return form;

            }



            if (form.getSystem().getId() != 7)

                hongBaoService.setNewUserHongBao(form, 1);

            LogHelper.userInfo("添加用户:" + form);

            if (form.getLoginType() == Constant.WEIXIN) {

                // final UserInfo temp = form;


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java

@@ -20,6 +20,7 @@


import org.springframework.stereotype.Service;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.UserRankingsMapper;

import com.yeshi.fanli.entity.admin.InviteGetMoney;

@@ -27,19 +28,15 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.exception.UserRankingsException;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



@Service

public class UserRankingsServiceImpl implements UserRankingsService {



    @Resource

    private UserRankingsMapper userRankingsMapper;

    @Resource

    private HongBaoService hongBaoService;

	


    @Override

    public int insertSelective(UserRankings record) throws UserRankingsException {


 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderItemServcie.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderService.java

@@ -35,11 +35,6 @@


    public Order getOrder(String orderid, int orderType);



    public void failureOrder(final String orderid, final int orderType) throws ObjectStateException;



    // 维权订单处理

    public void failureOrderWithWeiQuan(final String orderid, final int orderType) throws ObjectStateException;



    public boolean isfirstOrder(long uid);



    public List<Order> setOrderState(final String orderid, final int orderType);

@@ -49,9 +44,7 @@
    public Order find(long id);



    public void update(Order findOrder);



    public void update(TaoBaoWeiQuanOrder order);



	
    public Order findOrderByOrderIdAndType(String orderId, int type);



    public Order findOrderByOrderIdAndTypeAndVersion(String orderId, int type, int version);


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -11,9 +11,6 @@
import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;



import javax.annotation.PostConstruct;

import javax.annotation.Resource;



import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.HttpException;

import org.apache.commons.httpclient.methods.GetMethod;

@@ -29,12 +26,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -47,40 +38,10 @@
@Component

public class TaoBaoOrderUtil {



    private final static String CACHENAME = "tbCookie";



    private static final String ORDERFAILURE = "订单失效";

    private static final String ORDERPAYMENT = "订单付款";

    private static final String ORDERSETTLEMENT = "订单结算";

    private static final String ORDERSUCCESS = "订单成功";



    @Resource

    private OrderService orderService;

    @Resource

    private HongBaoService hongBaoService;

    @Resource

    private ConfigService configService;



    @Resource

    private OrderItemServcie orderItemServcie;



    @Resource

    private HongBaoManageService hongBaoManageService;



    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    private static TaoBaoOrderUtil taoBaoOrderUtil;



    @PostConstruct

    public void init() {

        taoBaoOrderUtil = this;

        taoBaoOrderUtil.orderService = this.orderService;

        taoBaoOrderUtil.hongBaoService = this.hongBaoService;

        taoBaoOrderUtil.configService = this.configService;

        taoBaoOrderUtil.hongBaoManageService = this.hongBaoManageService;

        taoBaoOrderUtil.orderItemServcie = this.orderItemServcie;

    }



    /**

     * 获取淘宝联盟的Cookie

@@ -595,7 +556,6 @@


    }





    /**

     * 解析维权订单

     * 

@@ -758,8 +718,8 @@
        if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))

            commonOrder.setSettleTime(

                    new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));

        commonOrder.setSourcePosition(

                String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));

        commonOrder.setSourcePosition(String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(),

                taoBaoOrder.getAdPositionId()));

        commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO);

        int state = 0;

        if ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState())) {