mac преди 7 месеца
родител
ревизия
793d88274a

+ 1 - 1
lhb-basic/lhb-basic-api/src/main/java/com/kxs/lhb/basic/api/model/LhbOrder.java

@@ -277,7 +277,7 @@ public class LhbOrder extends Model<LhbOrder> implements Serializable {
      * 工号
      */
     @Schema(description = "工号")
-    @NotBlank(groups = Insert.class, message = "服务商号不能为空")
+    @NotBlank(groups = Insert.class, message = "号不能为空")
     private String employNum;
 
 

+ 1 - 2
lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -132,7 +132,6 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
         //订单号
         String orderSn = CommonConstants.ORDER_SN_PREFIX + IdUtil.getSnowflakeNextIdStr();
         order.setOrderSn(orderSn);
-        order.setEmployNum(user.getEmployNum());
         order.setUserId(user.getId());
 
         //预占号码
@@ -414,7 +413,7 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
                 .province(areas.get(0).getAreaName())
                 .city(areas.get(1).getAreaName())
                 .remark(order.getRemark())
-                .createTime(LocalDateTimeUtil.format(LocalDate.now(), DatePattern.NORM_DATETIME_PATTERN))
+                .createTime(LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.NORM_DATETIME_PATTERN))
                 .build();
         notifyService.bindPush(bindNotify, order.getIsvNo());
     }

+ 1 - 1
lhb-basic/lhb-basic-biz/src/main/resources/mapper/LhbAreaMapper.xml

@@ -21,7 +21,7 @@
                 #{code}
             </foreach>
         </where>
-        ORDER BY FIELD(b.user_id, <foreach collection="codes" item="code" separator=",">#{code}</foreach>)
+        ORDER BY FIELD(area_code, <foreach collection="codes" item="code" separator=",">#{code}</foreach>)
     </select>