update

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -950,7 +950,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
     }
 
 
-
     /**
      * 参数补全
      *

src/main/java/com/gogirl/domain/order/mall/MallOrder.java

@@ -147,7 +147,6 @@ public class MallOrder implements Serializable {
     @ApiModelProperty("状态机备注")
     private String remark;
 
-
     @TableField(exist = false)
     @ApiModelProperty(value = "配送地址id", required = true)
     private Long mallOrderAddressId;

src/main/java/com/gogirl/domain/order/mall/MallOrderDetail.java

 package com.gogirl.domain.order.mall;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gogirl.infrastructure.common.annotation.DictParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -69,9 +71,13 @@ public class MallOrderDetail implements Serializable {
     @ApiModelProperty("详情支付总金额")
     private BigDecimal payAmount;
 
+    @DictParam(dictCode = "MALL_ORDER_DETAIL_REFUND_STATUS", dictValueParam = "refundStatusStr")
     @ApiModelProperty("0-正常 1-退款中 2-已退款")
     private Integer refundStatus;
 
+    @TableField(exist = false)
+    private String refundStatusStr;
+
     public MallOrderDetail() {
 
     }

src/main/java/com/gogirl/domain/order/mall/MallRefundOrder.java

@@ -30,22 +30,31 @@ public class MallRefundOrder implements Serializable {
     @TableId(type = IdType.ID_WORKER)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
+
     @ApiModelProperty("商城购买订单id")
     private Long mallOrderId;
+
     @ApiModelProperty("顾客id")
     private Integer customerId;
+
     @ApiModelProperty("发起退款时间")
     private Long refundTime;
+
     @ApiModelProperty("退款联系人姓名")
     private String refundContactName;
+
     @ApiModelProperty("退款联系人手机号")
     private String refundContactPhone;
+
     @ApiModelProperty("退款原因")
     private String refundReason;
+
     @ApiModelProperty("订单总金额")
     private BigDecimal refundTotalAmount;
+
     @ApiModelProperty("退款单状态 1-退款中 2-已退款")
     private Integer status;
+
     @TableField(exist = false)
     @ApiModelProperty("订单详情")
     private List<MallRefundOrderDetail> mallOrderDetailList;

src/main/java/com/gogirl/domain/order/purchase/PurchaseOrder.java

 package com.gogirl.domain.order.purchase;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gogirl.infrastructure.common.annotation.DictParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -61,9 +63,13 @@ public class PurchaseOrder implements Serializable {
 
     private String departmentName;
 
+    @DictParam(dictCode = "PURCHASE_ORDER_STATUS", dictValueParam = "statusStr")
     @ApiModelProperty(value = "-1.作废 1.待采购;2.采购中;3.待入库;4.待出库;5.待收货;6.已完成;")
     private Integer status;
 
+    @TableField(exist = false)
+    private String statusStr
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;

src/main/java/com/gogirl/infrastructure/mapper/store/store/StoreClassesTechnicianMapper.java

@@ -23,19 +23,28 @@ public interface StoreClassesTechnicianMapper extends BaseMapper<StoreClassesTec
                                                        @Param("departmentId") Integer departmentId,
                                                        @Param("days") String days);
 
-    List<StoreClassesTechnician> listClassTimeByStartDate(@Param("startDate") String startDate, @Param("startTime") String startTime, @Param("departmentId") Integer departmentId);
+    List<StoreClassesTechnician> listClassTimeByStartDate(@Param("startDate") String startDate,
+                                                          @Param("startTime") String startTime,
+                                                          @Param("departmentId") Integer departmentId);
 
-    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId, @Param("days") String days, @Param("departmentId") Integer departmentId);
+    List<StoreClassesTechnician> listClassesTechnicianDetail(@Param("userId") Integer userId,
+                                                             @Param("days") String days,
+                                                             @Param("departmentId") Integer departmentId);
 
-    List<StoreClassesTechnician> listClassesTechnicianDetailByDays(@Param("userId") Integer userId, @Param("days") String days);
+    List<StoreClassesTechnician> listClassesTechnicianDetailByDays(@Param("userId") Integer userId,
+                                                                   @Param("days") String days);
 
     int updateClassesTechnician(StoreClassesTechnician storeClassesTechnician);
 
     int insertClassesTechnician(StoreClassesTechnician storeClassesTechnician);
 
-    List<StoreClassesTechnician> listByDepartmentIdAndDays(@Param("departmentId") Integer departmentId, @Param("days") String days);
+    List<StoreClassesTechnician> listByDepartmentIdAndDays(@Param("departmentId") Integer departmentId,
+                                                           @Param("days") String days);
 
-    StoreClassesTechnician selectOneClassTech(@Param("departmentId") Integer departmentId, @Param("day") Date day, @Param("technicianId") Integer technicianId);
+    StoreClassesTechnician selectOneClassTech(@Param("departmentId") Integer departmentId,
+                                              @Param("day") Date day,
+                                              @Param("technicianId") Integer technicianId);
 
-    List<Integer> deleteDayClassesIds(@Param("departmentId") Integer departmentId, @Param("day") Date day);
+    List<Integer> deleteDayClassesIds(@Param("departmentId") Integer departmentId,
+                                      @Param("day") Date day);
 }

src/main/java/com/gogirl/shared/order/StoreTechnicianPeriod.java

@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-
 public class StoreTechnicianPeriod implements Serializable {
 
     /**