首页统计

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -48,16 +48,17 @@ public class OrderVo {
      */
     @ApiModelProperty("C端用户ID")
     private Long userId;
+    @ExcelProperty(value = "下单人姓名", order = 2)
     @ApiModelProperty(value = "C端用户名称")
     private String userName;
-    @ExcelProperty(value = "下单手机号", order = 7)
+    @ExcelProperty(value = "下单手机号", order = 3)
     @ApiModelProperty(value = "C端用户手机号")
     private String userMobile;
 
     /**
      * 状态
      */
-    @ExcelProperty(value = "订单状态", converter = ExcelEnumConvert.class, order = 10)
+    @ExcelProperty(value = "订单状态", converter = ExcelEnumConvert.class, order = 5)
     @ExcelDictFormat(readConverterExp = "1=待确认,2=待服务,3=进行中,5=已完成,6=已取消,7=已退款")
     @ApiModelProperty("状态")
     private OrderStatus status;
@@ -67,9 +68,11 @@ public class OrderVo {
      */
     @ApiModelProperty("医院ID")
     private Long hospitalId;
-    @ExcelProperty(value = "下单医院", order = 8)
+    @ExcelProperty(value = "下单医院", order = 6)
     @ApiModelProperty(value = "医院名称")
     private String hospitalName;
+    @ExcelProperty(value = "医院地址", order = 8)
+    private String hospitalAddress;
     @ApiModelProperty(value = "医院信息")
     private HospitalVo hospitalVo;
 
@@ -78,19 +81,21 @@ public class OrderVo {
      */
     @ApiModelProperty("医院科室ID")
     private Long hospitalDepartmentId;
-    @ExcelProperty(value = "所在科室", order = 9)
+    @ExcelProperty(value = "所在科室", order = 7)
     @ApiModelProperty(value = "医院科室名称")
     private String hospitalDepartmentName;
 
     /**
      * 房床号
      */
+    @ExcelProperty(value = "房床号", order = 11)
     @ApiModelProperty("房床号")
     private String roomNumber;
 
     /**
      * 订单备注
      */
+    @ExcelProperty(value = "订单备注", order = 16)
     @ApiModelProperty("订单备注")
     private String remarks;
 
@@ -107,13 +112,13 @@ public class OrderVo {
      */
     @ApiModelProperty("服务ID")
     private Long serviceId;
-    @ExcelProperty(value = "服务名称", order = 2)
+    @ExcelProperty(value = "服务名称", order = 10)
     @ApiModelProperty("服务名称")
     private String serviceName;
     /**
      * 服务单位
      */
-    @ExcelProperty(value = "服务单位", converter = ExcelEnumConvert.class, order = 5)
+    @ExcelProperty(value = "服务单位", converter = ExcelEnumConvert.class, order = 13)
     @ExcelDictFormat(readConverterExp = "0=天,1=小时,2=次,3=套")
     @ApiModelProperty("服务单位")
     private ServiceUnit serviceUnit;
@@ -126,27 +131,28 @@ public class OrderVo {
     /**
      * 期望时间
      */
+    @ExcelProperty(value = "期望时间", order = 9)
     @ApiModelProperty("期望时间")
     private Date expectedTime;
 
     /**
      * 下单数量
      */
-    @ExcelProperty(value = "下单数量", order = 4)
+    @ExcelProperty(value = "下单数量", order = 12)
     @ApiModelProperty("下单数量")
     private Integer orderNum;
 
     /**
      * 销售价
      */
-    @ExcelProperty(value = "销售价", order = 3)
+    @ExcelProperty(value = "销售价", order = 14)
     @ApiModelProperty("销售价")
     private BigDecimal sellingPrice;
 
     /**
      * 应付价格
      */
-    @ExcelProperty(value = "应付金额", order = 6)
+    @ExcelProperty(value = "应付金额", order = 15)
     @ApiModelProperty("应付价格")
     private BigDecimal totalPrice;
 
@@ -169,7 +175,7 @@ public class OrderVo {
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "下单时间", order = 11)
+    @ExcelProperty(value = "下单时间", order = 4)
     @ApiModelProperty("创建时间")
     private Date createTime;
 

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.info.hospital.domain.vo.HospitalStatisticsVo;
+import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.hospital.service.IHospitalDepartmentService;
 import com.ruoyi.info.hospital.service.IHospitalService;
 import com.ruoyi.info.order.domain.Order;
@@ -284,7 +285,9 @@ public class OrderServiceImpl implements IOrderService {
 
     private List<OrderVo> convertAllList(List<OrderVo> list) {
         return list.stream().map(o -> {
-            o.setHospitalName(hospitalService.queryNameById(o.getHospitalId()));
+            HospitalVo hospitalVo = hospitalService.queryDelById(o.getHospitalId());
+            o.setHospitalName(hospitalVo.getName());
+            o.setHospitalAddress(hospitalVo.getProvinceName() + hospitalVo.getCityName() + hospitalVo.getAreaName() + hospitalVo.getAddress());
             o.setHospitalDepartmentName(hospitalDepartmentService.queryNameById(o.getHospitalDepartmentId()));
             return o;
         }).collect(Collectors.toList());

ruoyi-info/src/main/resources/mapper/order/OrderMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="queryList">
-        select o.*, u.mobile as userMobile, sp.name as serviceName from tb_order o
+        select o.*, u.nickname as userName, u.mobile as userMobile, sp.name as serviceName from tb_order o
         left join tb_user u on u.id = o.user_id
         left join tb_service_product sp on sp.id = o.service_id
         <where>

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -200,7 +200,7 @@ public class UserServiceImpl implements IUserService {
         }
 
 
-        User user = this.loadByMobile(wxUserDto.getMobile(), true);
+        User user = this.loadByMobile(wxUserDto.getMobile(), false);
         if(ObjectUtil.isNotNull(user))
         {
             //查询此用户是否绑定过微信