Commit 0f9af7d1 by huiyang.chen

Merge remote-tracking branch 'origin/qa' into qa

parents 2d14795d 2602e298
...@@ -216,7 +216,7 @@ public class CreateOrderVo { ...@@ -216,7 +216,7 @@ public class CreateOrderVo {
/** /**
* 是否需要开发票,1 需要 0不需要 * 是否需要开发票,1 需要 0不需要
*/ */
private Integer isInvoice; private Integer needInvoice;
/** /**
* 发票抬头 * 发票抬头
......
...@@ -742,7 +742,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -742,7 +742,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey()); orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
orderExtInfoDto.setFormId(createOrderVo.getFormId()); orderExtInfoDto.setFormId(createOrderVo.getFormId());
orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId()); orderExtInfoDto.setFromAppId(userLoginInfoDto.getWxAppId());
orderExtInfoDto.setIsInvoice(createOrderVo.getIsInvoice()); orderExtInfoDto.setNeedInvoice(createOrderVo.getNeedInvoice());
orderExtInfoDto.setInvoiceTitle(createOrderVo.getInvoiceTitle()); orderExtInfoDto.setInvoiceTitle(createOrderVo.getInvoiceTitle());
orderExtInfoDto.setNeedTableware(createOrderVo.getNeedTableware()); orderExtInfoDto.setNeedTableware(createOrderVo.getNeedTableware());
orderExtInfoDto.setThirdPartyMemberId(userLoginInfoDto.getThirdPartyMemberID()); orderExtInfoDto.setThirdPartyMemberId(userLoginInfoDto.getThirdPartyMemberID());
......
...@@ -164,7 +164,7 @@ public class OrderExtInfoDto { ...@@ -164,7 +164,7 @@ public class OrderExtInfoDto {
/** /**
* 是否需要开发票,1 需要 0不需要 * 是否需要开发票,1 需要 0不需要
*/ */
private Integer isInvoice; private Integer needInvoice;
/** /**
* 发票抬头 * 发票抬头
......
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