Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairService.java

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

@@ -116,6 +116,7 @@
            if (order.getOrderState().equalsIgnoreCase("订单付款") || order.getOrderState().equalsIgnoreCase("订单成功"))

                return;

        }

		


        List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,

                orderId);


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

New file
@@ -0,0 +1,18 @@
package com.yeshi.fanli.service.inter.order;



/**

 * 订单修复服务

 * @author Administrator

 *

 *

 */

public interface OrderRepairService {



    /**

     * 修复订单

     */

    public void repairOrder(String orderId);

	
	
	
}