update 同步dev_commodity分支商品改动

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/dto/CommodityManagementListDto.kt

@@ -36,8 +36,6 @@ data class Goods(
   val inventoryRest: Long,
   @SerializedName("online_status")
   val onlineStatus: Int,
-  @SerializedName("original_price")
-  val originalPrice: Double,
   @SerializedName("price")
   val price: Double,
   @SerializedName("total_amount_sold")

Components/BGoods/src/main/java/com/yidian/shenghuoquan/bgoods/ui/coupon/adapter/CommodityListAdapter.kt

@@ -216,37 +216,16 @@ class CommodityListAdapter(private val context: Context, private val status: Com
    * ViewHolder定义
    */
   class CommodityOnlineItemViewHolder(val binding: CommodityItemCommodityOnlineListBinding, itemView: View) :
-    RecyclerView.ViewHolder(itemView) {
-    init {
-      // 商品原价加删除线
-      binding.tvCommodityOriginalPrice.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
-      binding.tvCommodityOriginalPrice.paint.isAntiAlias = true
-    }
-  }
+    RecyclerView.ViewHolder(itemView)
 
   class CommodityAuditItemViewHolder(val binding: CommodityItemCommodityAuditListBinding, itemView: View) :
-    RecyclerView.ViewHolder(itemView) {
-    init {
-      binding.tvCommodityOriginalPrice.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
-      binding.tvCommodityOriginalPrice.paint.isAntiAlias = true
-    }
-  }
+    RecyclerView.ViewHolder(itemView)
 
   class CommodityRejectItemViewHolder(val binding: CommodityItemCommodityRejectListBinding, itemView: View) :
-    RecyclerView.ViewHolder(itemView) {
-    init {
-      binding.tvCommodityOriginalPrice.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
-      binding.tvCommodityOriginalPrice.paint.isAntiAlias = true
-    }
-  }
+    RecyclerView.ViewHolder(itemView)
 
   class CommodityOfflineItemViewHolder(val binding: CommodityItemCommodityOfflineListBinding, itemView: View) :
-    RecyclerView.ViewHolder(itemView) {
-    init {
-      binding.tvCommodityOriginalPrice.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
-      binding.tvCommodityOriginalPrice.paint.isAntiAlias = true
-    }
-  }
+    RecyclerView.ViewHolder(itemView)
 
   class CommodityItemDecoration : RecyclerView.ItemDecoration() {
     override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {

Components/BGoods/src/main/res/layout/commodity_item_commodity_audit_list.xml

@@ -100,20 +100,6 @@
             app:layout_constraintTop_toBottomOf="@id/tv_commodity_count_sold"
             tools:text="10.00" />
 
-        <TextView
-            android:id="@+id/tv_commodity_original_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp6"
-            android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp12"
-            android:visibility="gone"
-            app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
-            tools:text="12.00" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file

Components/BGoods/src/main/res/layout/commodity_item_commodity_offline_list.xml

@@ -100,20 +100,6 @@
             app:layout_constraintTop_toBottomOf="@id/tv_commodity_count_sold"
             tools:text="10.00" />
 
-        <TextView
-            android:id="@+id/tv_commodity_original_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp6"
-            android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp12"
-            android:visibility="gone"
-            app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
-            tools:text="12.00" />
-
         <TextView
             android:id="@+id/tv_commodity_action"
             android:layout_width="wrap_content"

Components/BGoods/src/main/res/layout/commodity_item_commodity_online_list.xml

@@ -100,20 +100,6 @@
             app:layout_constraintTop_toBottomOf="@id/tv_commodity_count_sold"
             tools:text="10.00" />
 
-        <TextView
-            android:id="@+id/tv_commodity_original_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp6"
-            android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp12"
-            android:visibility="gone"
-            app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
-            tools:text="12.00" />
-
         <TextView
             android:id="@+id/tv_commodity_action"
             android:layout_width="wrap_content"

Components/BGoods/src/main/res/layout/commodity_item_commodity_reject_list.xml

@@ -100,20 +100,6 @@
             app:layout_constraintTop_toBottomOf="@id/tv_commodity_count_sold"
             tools:text="10.00" />
 
-        <TextView
-            android:id="@+id/tv_commodity_original_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp6"
-            android:text="@{@string/commodity_original_price((int) data.originalPrice)}"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp12"
-            android:visibility="gone"
-            app:layout_constraintBaseline_toBaselineOf="@id/tv_commodity_price"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_commodity_price"
-            tools:text="12.00" />
-
         <TextView
             android:id="@+id/tv_commodity_edit"
             android:layout_width="wrap_content"

Components/BManagerCenter/src/main/java/com/yidian/shenghuoquan/bmanagercenter/ui/store/EditStoreActivity.kt

@@ -7,10 +7,10 @@ import com.tbruyelle.rxpermissions3.RxPermissions
 import com.yidian.bcommon.base.BaseActivity
 import com.yidian.bcommon.extensions.hideKeyBoard
 import com.yidian.bcommon.utils.EditTextUtils
+import com.yidian.bcommon.utils.StorageUtil
 import com.yidian.bcommon.utils.ToastUtils
 import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityStoreEditBinding
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
-import com.yidian.bcommon.utils.StorageUtil
 import com.yidian.shenghuoquan.bmanagercenter.widget.CommonTopBarView
 
 /**
@@ -134,7 +134,7 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
     requestParams["address"] = store.title
     ApiService.updateStore(requestParams) {
       if (it) {
-        ToastUtils.showLongSafe("保存成功，门店经纬度：${store.longitude}, ${store.latitude}")
+        ToastUtils.showLongSafe("保存成功")
         finish()
       }
     }