刪除OrderItem和ThreeSaleGift

admin

2019-03-14 46b375c499c43c704fcc6c23d191251cea4bb859

刪除OrderItem和ThreeSaleGift

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

@@ -37,6 +37,7 @@
import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.dto.money.AccountDetails;

import com.yeshi.fanli.dto.order.OrderItem;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

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

@@ -44,7 +45,6 @@
import com.yeshi.fanli.entity.bus.user.Extract;

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

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

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

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

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

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


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleGiftMapper.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderItemMapper.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/order/OrderItemDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/user/ThreeSaleGiftDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dto/money/AccountDetails.java

@@ -1,17 +1,7 @@
package com.yeshi.fanli.dto.money;



import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Transient;



import org.yeshi.utils.mybatis.Column;



import com.google.gson.annotations.Expose;

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

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

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



public class AccountDetails {


 fanli/src/main/java/com/yeshi/fanli/dto/order/OrderItem.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/entity/bus/user/OrderItem.java
@@ -1,23 +1,11 @@
package com.yeshi.fanli.entity.bus.user;

package com.yeshi.fanli.dto.order;



import java.math.BigDecimal;



import javax.persistence.Entity;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.Table;

import javax.persistence.Transient;



import com.google.gson.annotations.Expose;

import org.yeshi.utils.mybatis.Column;

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

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



@Entity

@Table(name = "yeshi_ec_order_item")

@org.yeshi.utils.mybatis.Table("yeshi_ec_order_item")

public class OrderItem {

    // -1:退款 1已支付 2结算 3已到账 4售后

    public final static int STATE_TUIKUAN = -1;

@@ -26,86 +14,58 @@
    public final static int STATE_DAOZHANG = 3;

    public final static int STATE_SHOUHOU = 4;



    @Column(name = "id")

    @Id

    @GeneratedValue(strategy = GenerationType.AUTO)

    @Expose

    private Long id;



    public OrderItem(Long id) {

        this.id = id;

    }



    @Column(name = "picture")

    @Expose

    private String picture;// 图片



    @Column(name = "auctionId")

    @Expose

    private Long auctionId;// 商品ID



    @Column(name = "title")

    @Expose

    private String title;// 商品名称



    @Column(name = "orderId")

    @Expose

    private String orderId;// 订单号



    @Column(name = "type")

    private Integer type;// 订单类型



    @Column(name = "state")

    @Expose

    private Integer state; // -1:退款 1已支付 2结算 3已到账 4售后



    @Column(name = "payMoney")

    @Expose

    private BigDecimal payMoney;// 付款金额



    @Column(name = "fanMoney")

    @Expose

    private BigDecimal fanMoney;// 返利金额



    @Column(name = "createTime")

    @Expose

    private Long createTime;



    @Column(name = "settlementTime")

    private Long settlementTime;// 结算时间



    @Column(name = "refundTime")

    private Long refundTime;// 退款时间



    @Column(name = "fanTime")

    private Long fanTime;// 返利时间



    @Column(name = "isGift")

    private Boolean isGift;// 是否有分销提成 true：有



    @Transient

    @Expose

    private String desc;



    @Column(name = "uid")

    @ManyToOne

    @JoinColumn(name = "uid")

    private UserInfo userInfo;



    @Column(name = "oid")

    @ManyToOne

    @JoinColumn(name = "oid")

    private Order order;



    @Column(name = "version")

    private Integer version;// 版本1.2.3之前为1 后为2



    @Column(name = "pre_pay_money")

    @javax.persistence.Column(name = "pre_pay_money")

    private BigDecimal prePayMoney;



    @Expose

    @Transient

    private String stateDesc;// 状态简介



    public String getStateDesc() {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java

@@ -19,6 +19,7 @@
import javax.persistence.UniqueConstraint;



import com.google.gson.annotations.Expose;

import com.yeshi.fanli.dto.order.OrderItem;



/**

 * 订单


 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleGift.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/taobao/OrderItemHongBao.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.entity.taobao;



import com.yeshi.fanli.dto.HongBao;

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

import com.yeshi.fanli.dto.order.OrderItem;



public class OrderItemHongBao {

    HongBao hongBao;


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

@@ -14,7 +14,6 @@
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.ThreeSaleGiftService;

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

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

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

@@ -37,8 +36,6 @@
        System.out.println("初始化:UpdateOrderJob");

    }



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;

    @Resource

    private OrderProcessService orderProcessService;




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

@@ -18,7 +18,6 @@
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.ThreeSaleGiftService;

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

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

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

@@ -40,10 +39,6 @@
    public UpdateOrderJob() {

        System.out.println("初始化:UpdateOrderJob");

    }





    @Resource

    private ThreeSaleGiftService threeSaleGiftService;



    @Resource

    private OrderProcessService orderProcessService;


 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleGiftMapper.xml

File was deleted

 fanli/src/main/java/com/yeshi/fanli/mapping/order/OrderItemMapper.xml

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -17,7 +17,6 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

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

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

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

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

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

@@ -32,13 +31,8 @@
    @Resource

    private HongBaoV2CountMapper hongBaoV2CountMapper;







    @Resource

    private TaoBaoOrderMapper taoBaoOrderMapper;



    @Resource

    private OrderItemMapper orderItemMapper;



    @Resource

    private CommonOrderMapper commonOrderMapper;


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

@@ -19,7 +19,6 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

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

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

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

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

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

@@ -64,9 +63,6 @@


    @Resource

    private TaoBaoOrderMapper taoBaoOrderMapper;



    @Resource

    private OrderItemMapper orderItemMapper;



    @Resource

    private CommonOrderMapper commonOrderMapper;


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

File was deleted

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

@@ -20,11 +20,9 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

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

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

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

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

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

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

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

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

import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

@@ -76,24 +74,14 @@
    @Resource

    private PidUserMapper pidUserMapper;





    @Resource

    private UserInfoMapper userInfoMapper;



    @Resource

    private OrderItemMapper orderItemMapper;





    @Resource

    private HongBaoManageMapper hongBaoManageMapper;



    @Resource

    private AccountMessageMapper accountMessageMapper;







    @Resource

    private ThreeSaleGiftMapper threeSaleGiftMapper;



    @Resource

    private OrderService orderService;


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

@@ -22,14 +22,11 @@
import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.NumberUtil;



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

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.HongBaoV2;

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

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

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.OrderService;

@@ -57,19 +54,10 @@
    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private ThreeSaleGiftService threeSaleGiftService;



    @Resource

    private OrderMapper orderMapper;



    @Resource

    private OrderItemMapper orderItemMapper;



    @Resource

    private HongBaoOrderService hongBaoOrderService;



    @Resource

    private ThreeSaleGiftMapper threeSaleGiftMapper;



    public List<Order> getOrderByUid(int index, long uid) {




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

@@ -24,14 +24,12 @@
import com.yeshi.fanli.dao.mybatis.BindingAccountMapper;

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

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

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

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

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

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

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

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

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

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

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

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

@@ -67,9 +65,6 @@


    @Resource

    private OrderMapper orderMapper;



    @Resource

    private OrderItemMapper orderItemMapper;



    @Resource

    private ThreeSaleSerivce threeSaleSerivce;

@@ -835,7 +830,6 @@
        // TODO 备份资金明细

        // 备份订单，子订单信息

        List<Order> orderList = orderMapper.selectByUid(uid);

        List<OrderItem> orderItemList = orderItemMapper.selectByUid(uid);



        // 备份邀请关系

        List<ThreeSale> threeSaleList = new ArrayList<>();

@@ -850,9 +844,6 @@


            fw.write("#Order" + "\r\n");

            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderList) + "\r\n");



            fw.write("#OrderItem" + "\r\n");

            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(orderItemList) + "\r\n");



            fw.write("#ThreeSale" + "\r\n");

            fw.write(JsonUtil.getSimpleGsonWithDate().toJson(threeSaleList) + "\r\n");


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

File was deleted

 fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java

@@ -7,14 +7,15 @@
import java.util.List;

import java.util.Map;



import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.order.OrderItem;

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

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

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

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

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

import com.yeshi.fanli.log.LogHelper;

import org.yeshi.utils.JsonUtil;



public class HongBaoUtil {




 fanli/src/main/java/com/yeshi/fanli/util/factory/OrderItemFactory.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.util.factory;



import com.yeshi.fanli.dto.order.OrderItem;

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

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

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;




 fanli/src/main/java/com/yeshi/fanli/util/factory/ThreeSaleGiftFactory.java

File was deleted

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

@@ -17,8 +17,8 @@
import org.springframework.stereotype.Component;

import org.yeshi.utils.HttpUtil;



import com.yeshi.fanli.dto.order.OrderItem;

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

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

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

import com.yeshi.fanli.entity.order.CommonOrder;

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