Explorar o código

feat(order): 添加订单备注字段支持

- 在 StoreGroupOrderRepository 中为订单实体添加 mark 字段设置
- 更新 StoreOrderCreateValidate 验证规则,将 mark 字段限制为最大 255 字符
- 修改验证错误消息,将字符串类型验证改为长度范围验证
shichen hai 4 meses
pai
achega
6387091392

+ 2 - 1
app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -806,7 +806,8 @@ class StoreGroupOrderRepository extends BaseRepository
806
                         ->setPension($productEntity->getPension())
806
                         ->setPension($productEntity->getPension())
807
                         ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
807
                         ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
808
                         ->toArray()
808
                         ->toArray()
809
-                )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId());
809
+                )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId())
810
+                ->setMark($storeOrderCreateRequestEntity->getMark());
810
             $storeOrderEntityList[] = $storeOrderEntity;
811
             $storeOrderEntityList[] = $storeOrderEntity;
811
         }
812
         }
812
 
813
 

+ 2 - 2
app/validate/api/store/order/StoreOrderCreateValidate.php

@@ -17,7 +17,7 @@ class StoreOrderCreateValidate extends CommonValidate
17
         'address_id' => 'require|integer',
17
         'address_id' => 'require|integer',
18
         'pay_type' => 'require|integer',
18
         'pay_type' => 'require|integer',
19
         'share_id' => 'integer',
19
         'share_id' => 'integer',
20
-        'mark' => 'string',
20
+        'mark' => 'max:255',
21
         'pick_up_id' => 'require|integer'
21
         'pick_up_id' => 'require|integer'
22
     ];
22
     ];
23
 
23
 
@@ -33,7 +33,7 @@ class StoreOrderCreateValidate extends CommonValidate
33
         'pay_type.require' => '支付方式不能为空!',
33
         'pay_type.require' => '支付方式不能为空!',
34
         'pay_type.integer' => '支付方式类型错误!',
34
         'pay_type.integer' => '支付方式类型错误!',
35
         'share_id.integer' => 'share_id 必须是整数!',
35
         'share_id.integer' => 'share_id 必须是整数!',
36
-        'mark.string' => '备注类型错误',
36
+        'mark.between' => '备注超出范围',
37
         'pick_up_id.require' => '缺少提货点ID参数!',
37
         'pick_up_id.require' => '缺少提货点ID参数!',
38
         'pick_up_id.integer' => '提货点ID必须是整数!',
38
         'pick_up_id.integer' => '提货点ID必须是整数!',
39
     ];
39
     ];