订单详情修改
This commit is contained in:
parent
c35d8f864b
commit
60f77c0b66
|
|
@ -488,7 +488,7 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
|
||||||
orderDetailPayDTO.setOrderDate(DateTimeHelper.getNowDate());
|
orderDetailPayDTO.setOrderDate(DateTimeHelper.getNowDate());
|
||||||
orderDetailPayDTO.setOrderType(1);
|
orderDetailPayDTO.setOrderType(1);
|
||||||
orderDetailPayDTO.setFinalPrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getPrefPrice()));
|
orderDetailPayDTO.setFinalPrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getPrefPrice()));
|
||||||
orderDetailPayDTO.setDiscountPrice(isKeyBoard ? BigDecimal.ZERO : new BigDecimal(cookMeetDetailInfo.getSalePrice()).subtract(new BigDecimal(cookMeetDetailInfo.getPrefPrice())));
|
orderDetailPayDTO.setDiscountPrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getPrefPrice()));
|
||||||
orderDetailPayDTO.setQuantity(bean.getNum().intValue());
|
orderDetailPayDTO.setQuantity(bean.getNum().intValue());
|
||||||
orderDetailPayDTO.setSalePrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getSalePrice()));
|
orderDetailPayDTO.setSalePrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getSalePrice()));
|
||||||
orderDetailPayDTO.setSalesMode(1);
|
orderDetailPayDTO.setSalesMode(1);
|
||||||
|
|
|
||||||
|
|
@ -148,10 +148,8 @@ public class DownLoadDataService extends Service {
|
||||||
case "人员信息":
|
case "人员信息":
|
||||||
return service.getPersonInfo(null,null,0);
|
return service.getPersonInfo(null,null,0);
|
||||||
case "设备信息":
|
case "设备信息":
|
||||||
workConfig = new WorkConfig();
|
|
||||||
return service.getDeviceBase();
|
return service.getDeviceBase();
|
||||||
case "基础参数":
|
case "基础参数":
|
||||||
workConfig = new WorkConfig();
|
|
||||||
return service.getParamSettingInfo();
|
return service.getParamSettingInfo();
|
||||||
case "MQ_CONNECT":
|
case "MQ_CONNECT":
|
||||||
return activateFaceEngine();
|
return activateFaceEngine();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue