Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTrave...

luo

2024-01-31 021640e69b32dbd9b88a538402671c47f280df9e

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java

@@ -40,7 +40,7 @@
 * @Date 2020-06-09 09:30:59
 */
@Controller
@RequestMapping("/tPubWithdrawal")
@RequestMapping("")
public class TPubWithdrawalController extends BaseController {

    private String PREFIX = "/system/tPubWithdrawal/";
@@ -70,7 +70,7 @@
    /**
     * 跳转到提现列表首页
     */
    @RequestMapping("")
    @RequestMapping("/tPubWithdrawal")
    public String index() {
        return PREFIX + "tPubWithdrawal.html";
    }
@@ -78,7 +78,7 @@
    /**
     * 跳转到查看详情
     */
    @RequestMapping("/lookDetail/{id}/{type}")
    @RequestMapping("/tPubWithdrawal/lookDetail/{id}/{type}")
    public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
        TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
        String str = "";
@@ -93,7 +93,7 @@
     * 跳转到立即处理页面
     * ----------改为批量
     */
    @RequestMapping("/tPubWithdrawal_immediately/{tPubWithdrawalIds}")
    @RequestMapping("/tPubWithdrawal/tPubWithdrawal_immediately/{tPubWithdrawalIds}")
    public String tPubWithdrawalUpdate(@PathVariable String tPubWithdrawalIds, Model model) {
        model.addAttribute("tPubWithdrawalIds",tPubWithdrawalIds);
        return PREFIX + "tPubWithdrawal_immediately.html";
@@ -102,7 +102,7 @@
    /**
     * 获取提现列表列表
     */
    @RequestMapping(value = "/list")
    @RequestMapping(value = "/tPubWithdrawal/list")
    @ResponseBody
    public Object list(String insertTime,
                       String name,
@@ -129,7 +129,7 @@
    /**
     * 新增提现列表
     */
    @RequestMapping(value = "/add")
    @RequestMapping(value = "/tPubWithdrawal/add")
    @ResponseBody
    public Object add(TPubWithdrawal tPubWithdrawal) {
        tPubWithdrawalService.insert(tPubWithdrawal);
@@ -139,7 +139,7 @@
    /**
     * 立即处理操作
     */
    @RequestMapping(value = "/immediately")
    @RequestMapping(value = "/tPubWithdrawal/immediately")
    @ResponseBody
    public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
        TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
@@ -163,7 +163,7 @@
            if(2 == state){
                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                String payerTransactionID = sdf.format(new Date()) + tPubWithdrawal.getId();
                PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, "+" + phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/tPubWithdrawal/base/withdrawalCallback", narration);
                PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/base/withdrawalCallback", narration);
                AuthStatus authStatus = payoutResponse.getAuthStatus();
                Results results = payoutResponse.getResults().get(0);
                String statusCode = results.getStatusCode();
@@ -174,6 +174,7 @@
                    return ResultUtil.error(results.getStatusDescription());
                }
                tPubWithdrawal.setSerialNo(results.getBeepTransactionID());
                tPubWithdrawal.setState(4);
            }else{//回退金额
                tPubWithdrawal.setHandleTime(new Date());
                tPubWithdrawal.setState(state);
@@ -245,7 +246,7 @@
    /**
     * 修改提现列表
     */
    @RequestMapping(value = "/update")
    @RequestMapping(value = "/tPubWithdrawal/update")
    @ResponseBody
    public Object update(TPubWithdrawal tPubWithdrawal) {
        tPubWithdrawalService.updateById(tPubWithdrawal);
@@ -255,7 +256,7 @@
    /**
     * 提现列表详情
     */
    @RequestMapping(value = "/detail/{tPubWithdrawalId}")
    @RequestMapping(value = "/tPubWithdrawal/detail/{tPubWithdrawalId}")
    @ResponseBody
    public Object detail(@PathVariable("tPubWithdrawalId") Integer tPubWithdrawalId) {
        return tPubWithdrawalService.selectById(tPubWithdrawalId);
@@ -272,7 +273,7 @@
     * @param type
     * @param state
     */
    @RequestMapping(value = "/downloadList",method = RequestMethod.GET)
    @RequestMapping(value = "/tPubWithdrawal/downloadList",method = RequestMethod.GET)
    public void downloadList(String insertTime, String name, Integer withdrawalType, Integer userType, Integer type, Integer state,
                             HttpServletRequest request, HttpServletResponse response){
        String start = null;