修改bug

puzhibing

2023-06-27 4f8b61980b0db5995c16139d8eb9542b66da8a9f

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java

@@ -18,6 +18,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -35,6 +37,8 @@
@RestController
@RequestMapping("")
public class OrderController {

    Logger logger = LoggerFactory.getLogger(OrderController.class);

    @Autowired
    private IOrderService orderService;
@@ -410,7 +414,7 @@
                JSONObject jsonObject = JSON.parseObject(execute.getResult());
                Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
                if(2 == status){
                    System.err.println("转账失败");
                    logger.warn("转账失败");
                    return;
                }
                String parameter1 = jsonObject.getString("parameter1");
@@ -423,7 +427,7 @@
                out.flush();
                out.close();
            }else{
                System.err.println("转账失败：" + execute.getMsg());
                logger.warn("转账失败：" + execute.getMsg());
                return;
            }
        }catch (Exception e){
@@ -447,7 +451,7 @@
                    JSONObject jsonObject = JSON.parseObject(execute.getResult());
                    Integer status = jsonObject.getInteger("status");
                    if(2 == status){
                        System.err.println("异步分账回调异常");
                        logger.warn("异步分账回调异常");
                        return;
                    }
                    String merOrderId = jsonObject.getString("merOrderId");
@@ -469,15 +473,15 @@
                            TrhRequest<Receive> request1 = new TrhRequest();
                            InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
                            if(!"0000".equals(execute.getCode())){
                                System.err.println("确认收货" + execute.getMsg());
                                logger.warn("确认收货" + execute.getMsg());
                            }
                            JSONObject jsonObject = JSON.parseObject(execute.getResult());
                            String status = jsonObject.getString("status");
                            if("2".equals(status)){
                                System.err.println("确认收货失败");
                                logger.warn("确认收货失败");
                            }
                            if("0".equals(status)){
                                System.err.println("确认收货处理中");
                                logger.warn("确认收货处理中");
                            }
                        }
                    }, 15000);