黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java


@@ -4,20 +4,18 @@


import com.stylefeng.guns.core.base.controller.BaseController;


import com.stylefeng.guns.core.beetl.ShiroExtUtil;


import com.stylefeng.guns.core.common.constant.factory.PageFactory;


import com.stylefeng.guns.core.shiro.ShiroKit;


import com.stylefeng.guns.core.util.SinataUtil;


import com.stylefeng.guns.modular.system.model.TOrderCharter;


import org.springframework.stereotype.Controller;


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


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


import org.springframework.ui.Model;


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


import org.springframework.beans.factory.annotation.Autowired;


import com.stylefeng.guns.core.log.LogObjectHolder;


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


import com.stylefeng.guns.modular.system.model.TIntegralOrder;


import com.stylefeng.guns.modular.system.service.ITIntegralOrderService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.ui.Model;


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


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


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


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




import javax.annotation.Resource;


import java.util.Map;




/**


@@ -29,12 +27,15 @@


@Controller


@RequestMapping("/tIntegralOrder")


public class TIntegralOrderController extends BaseController {




    


    private String PREFIX = "/system/tIntegralOrder/";




    


    @Autowired


    private ITIntegralOrderService tIntegralOrderService;




    


    @Resource


    private ShiroExtUtil shiroExtUtil;


    


    /**


     * 跳转到积分兑换订单首页


     */


@@ -42,7 +43,7 @@


    public String index() {


        return PREFIX + "tIntegralOrder.html";


    }




    


    /**


     * 跳转到查看详情


     */


@@ -70,13 +71,13 @@


    public Object list(String insertTime,String userName,String goodsName,String consigneeName,String consigneePhone,Integer state) {


        String beginTime = null;


        String endTime = null;


        if (SinataUtil.isNotEmpty(insertTime)){


        if (SinataUtil.isNotEmpty(insertTime)) {


            String[] timeArray = insertTime.split(" - ");


            beginTime = timeArray[0];


            endTime = timeArray[1];


        }


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();


        if (ShiroExtUtil.getUser().getRoleType() != 1) {


        if (shiroExtUtil.getUser().getRoleType() != 1) {


            page.setRecords(null);


        } else {


            page.setRecords(tIntegralOrderService.getIntegralOrderList(page, beginTime, endTime, userName, goodsName, consigneeName, consigneePhone, state));