fix 商品价格

liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java

@@ -409,6 +409,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
                             int addedCount = 0;
                             for (AudienceInfo audience :audienceInfoList){
                                 TCSimpleUserInfo userInfo = new TCSimpleUserInfo(audience.userID,audience.userName,audience.userAvatar);
+//                                TXCLog.e("wathcher_info", userInfo.nickname+" -- "+userInfo.userid);
                                 if (mAvatarListAdapter.addItem(userInfo)){
                                     if (addedCount != 0){
                                         mCurrentAudienceCount++;

saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleProductAdapter.java

@@ -27,7 +27,7 @@ public class SaleProductAdapter extends CoreAdapter<ProductListBean,ItemSaleProd
         super.onBind(holder, item, position);
         holder.tvBrandModel.setText(item.getGoodsModel());
         GlideImageLoader.loadFit(mContext, holder.ivImg, item.getFirstUrl(),R.drawable.icon_img_default);
-        holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext,item.getPrice()));
+        holder.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mContext,item.getActualPrice()));
         holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext,item.getSalesPrice()));
         if (item.getCollectionStatus() == 1){
             holder.btnCollect.setText(R.string.un_collect);

saleCenter/src/main/java/com/bigfish/salecenter/model/ProductDetailBean.java

@@ -45,6 +45,7 @@ public class ProductDetailBean implements Serializable {
     private String goodsModel;
     private String pn;
     private double price;
+    private double actualPrice;
     private double marketPrice;
     private double salesPrice;
     private double customerRebate;
@@ -70,6 +71,14 @@ public class ProductDetailBean implements Serializable {
     private List<GoodsCategorysBean> goodsCategorys;
     private List<GoodsPicsBean> goodsPics;
 
+    public double getActualPrice() {
+        return actualPrice;
+    }
+
+    public void setActualPrice(double actualPrice) {
+        this.actualPrice = actualPrice;
+    }
+
     public double getMarketPrice() {
         return marketPrice;
     }

saleCenter/src/main/java/com/bigfish/salecenter/model/ProductListBean.java

@@ -44,6 +44,7 @@ public class ProductListBean implements Serializable {
     private String goodsModel;
     private String pn;
     private double price;
+    private double actualPrice;
     private double marketPrice;
     private double salesPrice;
     private double customerRebate;
@@ -69,6 +70,14 @@ public class ProductListBean implements Serializable {
     private Object key;
     private Object orderBy;
 
+    public double getActualPrice() {
+        return actualPrice;
+    }
+
+    public void setActualPrice(double actualPrice) {
+        this.actualPrice = actualPrice;
+    }
+
     public double getMarketPrice() {
         return marketPrice;
     }

saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/ProductInstructionFragment.java

@@ -82,7 +82,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
                     addShareRecord(data);
                 }else {
                     PosterShareActivity.launch(mActivity,mDetail.getId(),mDetail.getGoodsModel()
-                            ,mDetail.getFirstUrl(),"pdetail",mDetail.getPrice(),mDetail.getMarketPrice());
+                            ,mDetail.getFirstUrl(),"pdetail",mDetail.getActualPrice(),mDetail.getMarketPrice());
                 }
             });
 
@@ -96,7 +96,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
         mBind.tvModel.setText(mDetail.getGoodsModel());
         mBind.tvCompany.setText(mDetail.getProviderName());
         mBind.tvCompanyPn.setText(mDetail.getPn());
-        mBind.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mActivity, mDetail.getPrice()));
+        mBind.tvSinglePrice.setText(CommonUtils.getIntMoneyStr(mActivity, mDetail.getActualPrice()));
         mBind.tvMarketPrice.setText("  "+CommonUtils.getIntMoneyStr(mActivity, mDetail.getMarketPrice())+"  ");
         mBind.tvMarketPrice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
         mBind.tvDesc.setText(mDetail.getBrief());

saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleProductFragment.java

@@ -197,7 +197,7 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
                 addShareRecord(data);
             }else {
                 PosterShareActivity.launch(mActivity,item.getId(),item.getGoodsModel()
-                        ,item.getFirstUrl(),"product",item.getPrice(),item.getMarketPrice());
+                        ,item.getFirstUrl(),"product",item.getActualPrice(),item.getMarketPrice());
             }
         });