|
|
@ -1558,6 +1558,7 @@ public class SysUserController { |
|
|
|
//这个是获取订单的数据中的商品数据
|
|
|
|
//这个是获取订单的数据中的商品数据
|
|
|
|
Grzx1 g1 = new Grzx1(); |
|
|
|
Grzx1 g1 = new Grzx1(); |
|
|
|
g1 = sysUserService.getallg2(id); |
|
|
|
g1 = sysUserService.getallg2(id); |
|
|
|
|
|
|
|
|
|
|
|
return Result.ok(g1); |
|
|
|
return Result.ok(g1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1569,6 +1570,18 @@ public class SysUserController { |
|
|
|
//这个是用于获取一个订单的全部信息
|
|
|
|
//这个是用于获取一个订单的全部信息
|
|
|
|
Grzx1 g1 = new Grzx1(); |
|
|
|
Grzx1 g1 = new Grzx1(); |
|
|
|
g1 = sysUserService.getallg2(id); |
|
|
|
g1 = sysUserService.getallg2(id); |
|
|
|
|
|
|
|
if (g1.getDeliveryStatus().equals("0")){ |
|
|
|
|
|
|
|
g1.setDeliveryStatus("未支付"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (g1.getDeliveryStatus().equals("1")){ |
|
|
|
|
|
|
|
g1.setDeliveryStatus("已支付"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (g1.getDeliveryStatus().equals("2")){ |
|
|
|
|
|
|
|
g1.setDeliveryStatus("申请退款"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (g1.getDeliveryStatus().equals("3")){ |
|
|
|
|
|
|
|
g1.setDeliveryStatus("确认退款"); |
|
|
|
|
|
|
|
} |
|
|
|
System.out.println(g1); |
|
|
|
System.out.println(g1); |
|
|
|
return Result.OK(g1); |
|
|
|
return Result.OK(g1); |
|
|
|
} |
|
|
|
} |
|
|
|