Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java

@@ -1,7 +1,15 @@
package com.yeshi.fanli.controller.devops;



import java.io.PrintWriter;



import javax.annotation.Resource;



import org.springframework.stereotype.Controller;

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



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

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

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



/**

 * 运维订单接口

@@ -13,8 +21,25 @@
@RequestMapping("devops/order")

public class OrderDevOpsController {



	
	
	
	
   @Resource

   private OrderProcessService orderProcessService;



   /**

    * 返利

    * @param hongBaoId

    * @param out

    */

   @RequestMapping("fanliByHongBaoId")

   public void fanli(Long hongBaoId, PrintWriter out) {

      try {

         orderProcessService.fanli(new HongBaoV2(hongBaoId));

         out.print("success");

      } catch (TaoBaoWeiQuanException e) {

         e.printStackTrace();

         out.print(e.getMessage());

      } catch (Exception e) {

         out.print(e.getMessage());

      }

   }



}