Commit 6cea6982 authored by 王海's avatar 王海

优惠券创建时间修改

parent d7eeb95a
...@@ -21,8 +21,11 @@ import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter; ...@@ -21,8 +21,11 @@ import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.util.ConvertUtil; import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter, public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
DialogTicketAddSettingBinding> { DialogTicketAddSettingBinding> {
...@@ -134,14 +137,22 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter, ...@@ -134,14 +137,22 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
trule.setTruleStatus(nowStatus); trule.setTruleStatus(nowStatus);
trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString
())); ()));
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
format.setTimeZone(TimeZone.getTimeZone("GMT+08:00"));
trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString() + " " + trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString() + " " +
"23:59:59")); "23:59:59"));
trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString try {
())); Date date = format.parse(mViewBinding.tvDate.getText().toString() +
if (!mViewBinding.etTicketCount.getText().toString().equals("")) { " 23:59:59");
trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString())); trule.setTruleExp(date.getTime());
} else { if (!mViewBinding.etTicketCount.getText().toString().equals("")) {
trule.setTruleUseNum((byte) 1); trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString
()));
} else {
trule.setTruleUseNum((byte) 1);
}
} catch (ParseException e) {
e.printStackTrace();
} }
return trule; return trule;
} }
......
...@@ -88,6 +88,10 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -88,6 +88,10 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
break; break;
case R.id.btn_send: { case R.id.btn_send: {
if (isNull()) { if (isNull()) {
if (truleList.size() <= 0) {
ToastUtils.showLong("没有优惠券");
return;
}
long tickerId = truleList long tickerId = truleList
.get(nowTickerItemId).getTruleMapId(); .get(nowTickerItemId).getTruleMapId();
mLoadingDialog.show((BaseActivity) getActivity()); mLoadingDialog.show((BaseActivity) getActivity());
......
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 to comment