订单奖励修改

admin

2019-10-22 32f925357776c46bd9e35cf9aad4fdd0f6535d1d

订单奖励修改

 fanli/src/main/java/com/yeshi/fanli/entity/order/OrderSubsidy.java

@@ -23,6 +23,13 @@
    // 已补贴成功

    public static final int STATE_SUBSIDIZED = 3;

    

    public OrderSubsidy(Long id) {

        super();

        this.id = id;

    }



    public OrderSubsidy() {

    }

    

    @Column(name = "os_id")

    private Long id;


 fanli/src/main/java/com/yeshi/fanli/exception/order/OrderSubsidyException.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.exception.order;



import com.yeshi.fanli.exception.BaseException;



public class OrderSubsidyException extends BaseException {

	 
    private static final long serialVersionUID = 1L;

	
    public OrderSubsidyException(int code, String msg) {

        super(code, msg);

    }



    public OrderSubsidyException() {

        super();

    }

}


 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -63,7 +63,6 @@
    public void updateSoonOrder() {

        if (!Constant.IS_TASK)

            return;



        LogHelper.job("开始爬取京东订单");

        long now = System.currentTimeMillis();




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

@@ -1,12 +1,17 @@
package com.yeshi.fanli.service.impl.order;



import java.util.Date;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

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

import com.yeshi.fanli.exception.order.OrderSubsidyException;

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

import com.yeshi.fanli.util.StringUtil;



@Service

public class OrderSubsidyServiceImpl implements OrderSubsidyService {

@@ -19,4 +24,26 @@
        return orderSubsidyMapper.getByOrderNoAndType(uid, orderNo, type);

    }



    @Transactional

    @Override

    public void addOrderSubsidy(OrderSubsidy orderSubsidy) throws OrderSubsidyException {

        if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())

                || orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)

            throw new OrderSubsidyException(1, "数据不完整");

        OrderSubsidy old = getByOrderNoAndType(orderSubsidy.getUid(), orderSubsidy.getOrderNo(),

                orderSubsidy.getSourceType());

        if (old != null) {// 修改

            // 修改状态

            OrderSubsidy update = new OrderSubsidy(old.getId());

            update.setMoney(orderSubsidy.getMoney());

            update.setState(orderSubsidy.getState());

            update.setUpdateTime(new Date());

            orderSubsidyMapper.updateByPrimaryKeySelective(update);

        } else {// 添加

            if (orderSubsidy.getCreateTime() == null)

                orderSubsidy.setCreateTime(new Date());

            orderSubsidyMapper.insertSelective(orderSubsidy);

        }

    }



}


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

@@ -1,11 +1,13 @@
package com.yeshi.fanli.service.inter.order;



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

import com.yeshi.fanli.exception.order.OrderSubsidyException;



public interface OrderSubsidyService {



    /**

     * 查询补贴

     * 
     * @param uid

     * @param orderNo

     * @param type

@@ -13,4 +15,12 @@
     */

    public OrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type);

     

    /**

     * 添加订单补贴

     * 
     * @param orderSubsidy

     * @throws OrderSubsidyException

     */

    public void addOrderSubsidy(OrderSubsidy orderSubsidy) throws OrderSubsidyException;



}