fix: 🐛 时间误差

server/duibats/src/controller/awards.controller.ts

@@ -214,7 +214,10 @@ export default class BaseController {
           v.name || '',
           v.type == 1 ? '/' : v.receiveName || '',
           v.type == 1 ? '/' : v.phone || '未填',
-          v.type == 1 ? '/' : v.province ? v.province + v.city + v.area + v.addressdetail : '未填',
+          v.type == 1 ? '/' : v.province ? v.province: '未填',
+          v.type == 1 ? '/' : v.city ? v.city : '未填',
+          v.type == 1 ? '/' : v.area ? v.area : '未填',
+          v.type == 1 ? '/' : v.addressdetail ? v.addressdetail : '未填',
           v.type == 1 ? '/' : shipMsg[v.shipStatus],
           v.type == 1 ? '/' : v.shipCompany || '/',
           v.type == 1 ? '/' : v.shipNum || '/'
@@ -332,8 +335,8 @@ export default class BaseController {
       let ad = item.province + item.city + item.area + item.addressdetail,
         type0 = item.type
       item.prizeId = item._id
-      item.createTime = formatTime(new Date(item.createTime)) || ''
-      item.receiveTime = item.receiveTime ? formatTime(new Date(item.receiveTime)) : '未填'
+      item.createTime = formatTime(new Date(item.createTime + EIGHT_HOURS)) || ''
+      item.receiveTime = item.receiveTime ? formatTime(new Date(item.receiveTime + EIGHT_HOURS)) : '未填'
       item.prizeDataType = prizePoolType[item.prizeDataType]
       item.type = prizeKind[item.type]
       item.receiveName = type0 == 3 ? item.receiveName || '未填' : '/'

server/duibats/src/service/activityconfig.service.ts

@@ -137,13 +137,14 @@ export default class ActivityConfigService {
 
   // 更新单条数据
   async updateOnePrizeById(id, data) {
+    const { useStock, ...rest } = data;
     return await this.activityconfigPrizeDao.update(
       {
         _id: id
       },
       {
         $set: {
-          ...data,
+          ...rest,
           updateTime: Date.now(),
           deleteStatus: DELETE_STATUS.EXIST
         }