Просмотр исходного кода

feat(order): 添加订单自提点ID字段支持

- 在StoreOrderEntity中新增pickUpId属性
- 实现getPickUpId和setPickUpId方法
- 在订单创建过程中设置自提点ID
- 支持订单实体中的自提点信息存储
shichen месяцев назад: 4
Родитель
Сommit
5fcc2d676c

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

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

+ 13 - 0
app/entity/data/store/StoreOrderEntity.php

@@ -101,6 +101,8 @@ class StoreOrderEntity extends DataEntity
101
     public $fzonePayType = null;
101
     public $fzonePayType = null;
102
     public $pensionJson = null; // 养老金设置(将当前商品的养老金分配设置保存一份)
102
     public $pensionJson = null; // 养老金设置(将当前商品的养老金分配设置保存一份)
103
 
103
 
104
+    public $pickUpId = null;
105
+
104
     /**
106
     /**
105
      * @return mixed
107
      * @return mixed
106
      */
108
      */
@@ -1771,6 +1773,17 @@ class StoreOrderEntity extends DataEntity
1771
         return $this;
1773
         return $this;
1772
     }
1774
     }
1773
 
1775
 
1776
+    public function getPickUpId()
1777
+    {
1778
+        return $this->pickUpId;
1779
+    }
1780
+
1781
+    public function setPickUpId($pickUpId): StoreOrderEntity
1782
+    {
1783
+        $this->pickUpId = $pickUpId;
1784
+        return $this;
1785
+    }
1786
+
1774
     public function deconstructionFzonePaytype()
1787
     public function deconstructionFzonePaytype()
1775
     {
1788
     {
1776
         if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {
1789
         if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {