Skip to content

android / dayu

Go to a project
Commit 08647706 by mReturn
Options

fix 商品价格

parent ad5c83b8
Inline Side-by-side
Showing with 23 additions and 4 deletions
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
...@@ -409,6 +409,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene ...@@ -409,6 +409,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
int addedCount = 0; int addedCount = 0;
for (AudienceInfo audience :audienceInfoList){ for (AudienceInfo audience :audienceInfoList){
TCSimpleUserInfo userInfo = new TCSimpleUserInfo(audience.userID,audience.userName,audience.userAvatar); TCSimpleUserInfo userInfo = new TCSimpleUserInfo(audience.userID,audience.userName,audience.userAvatar);
// TXCLog.e("wathcher_info", userInfo.nickname+" -- "+userInfo.userid);
if (mAvatarListAdapter.addItem(userInfo)){ if (mAvatarListAdapter.addItem(userInfo)){
if (addedCount != 0){ if (addedCount != 0){
mCurrentAudienceCount++; mCurrentAudienceCount++;
......
saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleProductAdapter.java
...@@ -27,7 +27,7 @@ public class SaleProductAdapter extends CoreAdapter<ProductListBean,ItemSaleProd ...@@ -27,7 +27,7 @@ public class SaleProductAdapter extends CoreAdapter<ProductListBean,ItemSaleProd
super.onBind(holder, item, position); super.onBind(holder, item, position);
holder.tvBrandModel.setText(item.getGoodsModel()); holder.tvBrandModel.setText(item.getGoodsModel());
GlideImageLoader.loadFit(mContext, holder.ivImg, item.getFirstUrl(),R.drawable.icon_img_default); 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())); holder.tvCommision.setText(CommonUtils.getIntMoneyStr(mContext,item.getSalesPrice()));
if (item.getCollectionStatus() == 1){ if (item.getCollectionStatus() == 1){
holder.btnCollect.setText(R.string.un_collect); 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 { ...@@ -45,6 +45,7 @@ public class ProductDetailBean implements Serializable {
private String goodsModel; private String goodsModel;
private String pn; private String pn;
private double price; private double price;
private double actualPrice;
private double marketPrice; private double marketPrice;
private double salesPrice; private double salesPrice;
private double customerRebate; private double customerRebate;
...@@ -70,6 +71,14 @@ public class ProductDetailBean implements Serializable { ...@@ -70,6 +71,14 @@ public class ProductDetailBean implements Serializable {
private List<GoodsCategorysBean> goodsCategorys; private List<GoodsCategorysBean> goodsCategorys;
private List<GoodsPicsBean> goodsPics; private List<GoodsPicsBean> goodsPics;
public double getActualPrice() {
return actualPrice;
}
public void setActualPrice(double actualPrice) {
this.actualPrice = actualPrice;
}
public double getMarketPrice() { public double getMarketPrice() {
return marketPrice; return marketPrice;
} }
......
saleCenter/src/main/java/com/bigfish/salecenter/model/ProductListBean.java
...@@ -44,6 +44,7 @@ public class ProductListBean implements Serializable { ...@@ -44,6 +44,7 @@ public class ProductListBean implements Serializable {
private String goodsModel; private String goodsModel;
private String pn; private String pn;
private double price; private double price;
private double actualPrice;
private double marketPrice; private double marketPrice;
private double salesPrice; private double salesPrice;
private double customerRebate; private double customerRebate;
...@@ -69,6 +70,14 @@ public class ProductListBean implements Serializable { ...@@ -69,6 +70,14 @@ public class ProductListBean implements Serializable {
private Object key; private Object key;
private Object orderBy; private Object orderBy;
public double getActualPrice() {
return actualPrice;
}
public void setActualPrice(double actualPrice) {
this.actualPrice = actualPrice;
}
public double getMarketPrice() { public double getMarketPrice() {
return marketPrice; return marketPrice;
} }
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/ProductInstructionFragment.java
...@@ -82,7 +82,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr ...@@ -82,7 +82,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
addShareRecord(data); addShareRecord(data);
}else { }else {
PosterShareActivity.launch(mActivity,mDetail.getId(),mDetail.getGoodsModel() 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 ...@@ -96,7 +96,7 @@ public class ProductInstructionFragment extends BaseFragment<SImplePresenter, Fr
mBind.tvModel.setText(mDetail.getGoodsModel()); mBind.tvModel.setText(mDetail.getGoodsModel());
mBind.tvCompany.setText(mDetail.getProviderName()); mBind.tvCompany.setText(mDetail.getProviderName());
mBind.tvCompanyPn.setText(mDetail.getPn()); 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.setText(" "+CommonUtils.getIntMoneyStr(mActivity, mDetail.getMarketPrice())+" ");
mBind.tvMarketPrice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG); mBind.tvMarketPrice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
mBind.tvDesc.setText(mDetail.getBrief()); 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 ...@@ -197,7 +197,7 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
addShareRecord(data); addShareRecord(data);
}else { }else {
PosterShareActivity.launch(mActivity,item.getId(),item.getGoodsModel() PosterShareActivity.launch(mActivity,item.getId(),item.getGoodsModel()
,item.getFirstUrl(),"product",item.getPrice(),item.getMarketPrice()); ,item.getFirstUrl(),"product",item.getActualPrice(),item.getMarketPrice());
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment