1/12
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
<!-- ${ew.customSqlSegment} -->
|
||||
|
||||
<select id="getStoreBySid" resultType="com.yxt.yyth.api.customerstore.CustomerStoreVo">
|
||||
select s.name ,s.phone,t.name as storeName,t.address ,t.businessHours from customer_store s left join lpk_store t on s.storeSid=t.sid
|
||||
select s.storeSid, s.name ,s.phone,t.name as storeName,t.address ,t.businessHours from customer_store s left join lpk_store t on s.storeSid=t.sid
|
||||
where customerSid=#{customerSid}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -451,22 +451,22 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
|
||||
}
|
||||
}
|
||||
}
|
||||
// CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
|
||||
// if(null!=customerStoreVo){
|
||||
// vo.setAddressName(customerStoreVo.getStoreName());
|
||||
// vo.setValue(customerStoreVo.getStoreSid());
|
||||
// vo.setCustomerName(customerStoreVo.getName());
|
||||
// vo.setCPhone(customerStoreVo.getPhone());
|
||||
// }
|
||||
//上次取货点
|
||||
LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
||||
if (null != vo1) {
|
||||
LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
|
||||
if (null != vo2) {
|
||||
vo.setAddressName(vo2.getName());
|
||||
vo.setValue(vo2.getSid());
|
||||
}
|
||||
CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
|
||||
if(null!=customerStoreVo){
|
||||
vo.setAddressName(customerStoreVo.getStoreName());
|
||||
vo.setValue(customerStoreVo.getStoreSid());
|
||||
vo.setCustomerName(customerStoreVo.getName());
|
||||
vo.setCPhone(customerStoreVo.getPhone());
|
||||
}
|
||||
//上次取货点
|
||||
// LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData();
|
||||
// if (null != vo1) {
|
||||
// LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData();
|
||||
// if (null != vo2) {
|
||||
// vo.setAddressName(vo2.getName());
|
||||
// vo.setValue(vo2.getSid());
|
||||
// }
|
||||
// }
|
||||
vo.setPName("企业菜窖");
|
||||
vo.setOrderCardVoList(empReserveOrderCardVos);
|
||||
return rb.success().setData(vo);
|
||||
|
||||
@@ -104,7 +104,7 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
|
||||
dto1.setCustomerSid(dto.getCustomerSid());
|
||||
dto1.setName(dto.getUserName());
|
||||
dto1.setPhone(dto.getUserPhone());
|
||||
dto1.setStoreSid(dto.getStoreSid());
|
||||
dto1.setStoreSid(dto.getValue());
|
||||
customerStoreService.saveStore(dto1);
|
||||
return rb.success().setData("预约成功");
|
||||
}
|
||||
@@ -160,7 +160,7 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService<EmpReserveOr
|
||||
dto1.setCustomerSid(dto.getCustomerSid());
|
||||
dto1.setName(dto.getUserName());
|
||||
dto1.setPhone(dto.getUserPhone());
|
||||
dto1.setStoreSid(dto.getStoreSid());
|
||||
dto1.setStoreSid(dto.getValue());
|
||||
customerStoreService.saveStore(dto1);
|
||||
return rb.success().setData("预约成功");
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService<LpkReserveOr
|
||||
dto1.setCustomerSid(dto.getCustomerSid());
|
||||
dto1.setName(dto.getUserName());
|
||||
dto1.setPhone(dto.getUserPhone());
|
||||
dto1.setStoreSid(dto.getStoreSid());
|
||||
dto1.setStoreSid(dto.getValue());
|
||||
customerStoreService.saveStore(dto1);
|
||||
return rb.success().setData("预约成功");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user