svnno****@sourc*****
svnno****@sourc*****
2007年 7月 28日 (土) 03:43:55 JST
Revision: 396 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=396 Author: takeharu Date: 2007-07-28 03:43:53 +0900 (Sat, 28 Jul 2007) Log Message: ----------- Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/service/impl/MemberServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/ProductService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/impl/ProductServiceImpl.java Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/OrderService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/impl/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/impl/OrderServiceImpl.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -29,15 +29,29 @@ customers.setCustomersGender(memberConfirmPage.getGender()); customers.setCustomersDob(DateUtil.getTimeStamp(memberConfirmPage.getCustomersDob())); AddressBook book = memberDxo.convertAddress(memberConfirmPage); + book.setEntryState(PageUtil.getLabelOfValue(memberConfirmPage.getEntryZoneIdItems(), memberConfirmPage.getEntryZoneId().toString())); - book.setEntryGender(customers.getCustomersGender()); book.setEntryFirstname(customers.getCustomersFirstname()); book.setEntryLastname(customers.getCustomersLastname()); book.setCustomers(customers); memberService.addMember(book); }else if(isUpdate()) { + Customers customers = memberService.getMember(memberConfirmPage.getCustomersId()); + AddressBook book = customers.getAddressBook(); + memberDxo.convert(memberConfirmPage,customers); + memberDxo.convert(memberConfirmPage,book); + + customers.setCustomersDob(DateUtil.getTimeStamp(memberConfirmPage.getCustomersDob())); + + book.setEntryState(PageUtil.getLabelOfValue(memberConfirmPage.getEntryZoneIdItems(), memberConfirmPage.getEntryZoneId().toString())); + book.setEntryGender(customers.getCustomersGender()); + book.setEntryFirstname(customers.getCustomersFirstname()); + book.setEntryLastname(customers.getCustomersLastname()); + + memberService.updateMember(customers); + }else { return null; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberConfirmPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -10,6 +10,8 @@ public class MemberConfirmPage { + private BigDecimal customersId; + @SubapplicationScope private String mode; @@ -285,4 +287,12 @@ this.mode = mode; } + public BigDecimal getCustomersId() { + return customersId; + } + + public void setCustomersId(BigDecimal customersId) { + this.customersId = customersId; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -7,10 +7,8 @@ import java.util.Map; import jp.sf.pal.pompei.dxo.MemberDxo; -import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customers; import jp.sf.pal.pompei.web.admin.member.service.MemberService; -import jp.sf.pal.pompei.web.util.PageUtil; public class MemberEditAction { private static final String MODE_INSERT = "insert"; @@ -54,6 +52,20 @@ return list; } + public Class prerender() { + if(isUpdate()) { + Customers customers = memberService.getMember(memberEditPage.getCustomersId()); + memberDxo.convert(customers,memberEditPage); + + String s = memberEditPage.getEntryPostcode1(); + + }else { + memberEditPage.setMode(MODE_INSERT); + setDefaultValue(); + } + return null; + } + private Map setValue(String lavel, String value) { Map map = new HashMap(); map.put("label", lavel); @@ -74,19 +86,10 @@ return list; } - public Class prerender() { - if(isUpdate()) { - }else { - memberEditPage.setMode(MODE_INSERT); - setDefaultValue(); - } - return null; - } - private void setDefaultValue() { - memberEditPage.setCustomersFirstname("テスト"); - memberEditPage.setCustomersLastname("一郎"); + memberEditPage.setCustomersLastname("佐藤"); + memberEditPage.setCustomersFirstname("浩一"); memberEditPage.setCustomersDob("20070101"); memberEditPage.setCustomersEmailAddress("aaa****@aaa*****"); memberEditPage.setCustomersTelephone("999-9999-9999"); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberEditPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -21,6 +21,8 @@ public static final String entryZoneId_TRequiredValidator = null; public static final String gender_TRequiredValidator = null; + @SubapplicationScope + private BigDecimal customersId; @SubapplicationScope private String customersDob; @@ -50,6 +52,9 @@ private String entryCompany; @SubapplicationScope + private String entryPostcode; + + @SubapplicationScope private String entryPostcode1; @SubapplicationScope @@ -228,4 +233,27 @@ public void setMode(String mode) { this.mode = mode; } + + public BigDecimal getCustomersId() { + return customersId; + } + + public void setCustomersId(BigDecimal customersId) { + this.customersId = customersId; + } + + public String getEntryPostcode() { + return entryPostcode1+entryPostcode2; + } + + public void setEntryPostcode(String entryPostcode) { + if(entryPostcode != null) { + String[] s = entryPostcode.split("-"); + if(s.length==2) { + this.entryPostcode1=s[0]; + this.entryPostcode2=s[1]; + } + } + this.entryPostcode = entryPostcode; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -24,11 +24,16 @@ } public Class prerender() { + if(memberListPage.isDelete()) { + memberService.deleteMember(memberListPage.getCustomersId()); + } + List memberItems = memberService.getMemberList(); List<Map> items = memberDxo.conbertMap(memberItems); + memberListPage.setMemberItems(items); - memberListPage.setMemberItems(items); + return null; } @@ -63,5 +68,10 @@ this.memberDxo = memberDxo; } + public Class doSearch() { + + return null; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/MemberListPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -21,6 +21,8 @@ private String title; + private boolean delete; + private int memberIndex; private List memberItems; @@ -104,5 +106,13 @@ this.memberIndex = memberIndex; } + public boolean isDelete() { + return delete; + } + public void setDelete(boolean delete) { + this.delete = delete; + } + + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/service/impl/MemberServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/service/impl/MemberServiceImpl.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/member/service/impl/MemberServiceImpl.java 2007-07-27 18:43:53 UTC (rev 396) @@ -1,11 +1,10 @@ package jp.sf.pal.pompei.web.admin.member.service.impl; +import java.math.BigDecimal; import java.util.List; -import jp.sf.pal.pompei.allcommon.bhv.setup.ConditionBeanSetupper; import jp.sf.pal.pompei.cbean.AddressBookCB; import jp.sf.pal.pompei.cbean.CustomersCB; -import jp.sf.pal.pompei.cbean.ProductsCB; import jp.sf.pal.pompei.exbhv.AddressBookBhv; import jp.sf.pal.pompei.exbhv.CustomersBhv; import jp.sf.pal.pompei.exbhv.CustomersInfoBhv; @@ -82,4 +81,33 @@ return customersList; } + public Customers getMember(BigDecimal customersId) { + CustomersCB customersCB = new CustomersCB(); + customersCB.setupSelect_AddressBook(); + customersCB.query().setCustomersId_Equal(customersId); + Customers customers = customersBhv.selectEntity(customersCB); + return customers; + } + + public void updateMember(Customers customers) { + + customersBhv.update(customers); + + AddressBook addressBook = customers.getAddressBook(); + addressBookBhv.update(addressBook); + + } + + public void deleteMember(BigDecimal customersId) { + Customers customers = getMember(customersId); + customers.setCustomersDefaultAddressId(new BigDecimal("0")); + customersBhv.update(customers); + + AddressBookCB addressBookCB = new AddressBookCB(); + addressBookCB.query().setCustomersId_Equal(customers.getCustomersId()); + addressBookBhv.deleteList(addressBookBhv.selectList(addressBookCB)); + + customersBhv.delete(customers); + } + } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,98 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Date; + +import jp.sf.pal.pompei.dxo.OrdersDxo; +import jp.sf.pal.pompei.exentity.Orders; +import jp.sf.pal.pompei.web.admin.order.service.OrderService; + +public class OrderConfirmAction { + + private static final String MODE_UPDATE = "update"; + + /** + * + */ + private OrderConfirmPage orderConfirmPage; + + private OrderService orderService; + private OrdersDxo ordersDxo; + + public Class initialize() { + return null; + } + + public Class prerender() { + return null; + } + + public Class doUpdate() { + Orders orders = orderService.getOrders(orderConfirmPage.getOrdersId()); + if(orders==null) { + orders = ordersDxo.convert(orderConfirmPage); + }else { + ordersDxo.convert(orderConfirmPage,orders); + } + + if(isUpdate()) { + orders.setLastModified(new Timestamp(new Date().getTime())); + }else { + orders.setLastModified(new Timestamp(new Date().getTime())); + orders.setDatePurchased(new Timestamp(new Date().getTime())); + orders.setOrdersStatusId(new BigDecimal("1")); + orders.setCustomersAddressFormatId(new BigDecimal("0")); + orders.setBillingAddressFormatId(new BigDecimal("0")); + orders.setDeliveryAddressFormatId(new BigDecimal("0")); + orders.setDeliveryCountry("1"); + orders.setBillingCountry("1"); + } + + //TODO 要変更 + orders.setCustomersCountry("1"); + orders.setPaymentMethod("銀行振込"); + + orderService.updateOrders(orders); + + return OrderListPage.class; + } + + private boolean isUpdate() { + if(orderConfirmPage.getMode() != null && orderConfirmPage.getMode().equals(MODE_UPDATE)) { + return true; + } + return false; + } + + /** + * @return orderConfirmPage + */ + public OrderConfirmPage getOrderConfirmPage() { + return orderConfirmPage; + } + + /** + * @param orderConfirmPage 設定する orderConfirmPage + */ + public void setOrderConfirmPage(OrderConfirmPage orderConfirmPage) { + this.orderConfirmPage = orderConfirmPage; + } + + public OrderService getOrderService() { + return orderService; + } + + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + + public OrdersDxo getOrdersDxo() { + return ordersDxo; + } + + public void setOrdersDxo(OrdersDxo ordersDxo) { + this.ordersDxo = ordersDxo; + } + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,287 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; + +public class OrderConfirmPage { + + private String mode; + + private String billingCity; + + private String billingCompany; + + private String billingName; + + private String billingPostcode; + + private String billingState; + + private String billingStreetAddress; + + private String billingSuburb; + + private String customersCity; + + private String customersCompany; + + private String customersEmailAddress; + + private BigDecimal customersId; + + private String customersName; + + private String customersPostcode; + + private String customersState; + + private String customersStreetAddress; + + private String customersSuburb; + + private String customersTelephone; + + private String deliveryCity; + + private String deliveryCompany; + + private String deliveryName; + + private String deliveryPostcode; + + private String deliveryState; + + private String deliveryStreetAddress; + + private String deliverySuburb; + + private BigDecimal ordersId; + + private String title; + + private String paymentMethod; + + public String getBillingCity() { + return billingCity; + } + + public void setBillingCity(String billingCity) { + this.billingCity = billingCity; + } + + public String getBillingCompany() { + return billingCompany; + } + + public void setBillingCompany(String billingCompany) { + this.billingCompany = billingCompany; + } + + public String getBillingName() { + return billingName; + } + + public void setBillingName(String billingName) { + this.billingName = billingName; + } + + public String getBillingPostcode() { + return billingPostcode; + } + + public void setBillingPostcode(String billingPostcode) { + this.billingPostcode = billingPostcode; + } + + public String getBillingState() { + return billingState; + } + + public void setBillingState(String billingState) { + this.billingState = billingState; + } + + public String getBillingStreetAddress() { + return billingStreetAddress; + } + + public void setBillingStreetAddress(String billingStreetAddress) { + this.billingStreetAddress = billingStreetAddress; + } + + public String getBillingSuburb() { + return billingSuburb; + } + + public void setBillingSuburb(String billingSuburb) { + this.billingSuburb = billingSuburb; + } + + public String getCustomersCity() { + return customersCity; + } + + public void setCustomersCity(String customersCity) { + this.customersCity = customersCity; + } + + public String getCustomersCompany() { + return customersCompany; + } + + public void setCustomersCompany(String customersCompany) { + this.customersCompany = customersCompany; + } + + public String getCustomersEmailAddress() { + return customersEmailAddress; + } + + public void setCustomersEmailAddress(String customersEmailAddress) { + this.customersEmailAddress = customersEmailAddress; + } + + public BigDecimal getCustomersId() { + return customersId; + } + + public void setCustomersId(BigDecimal customersId) { + this.customersId = customersId; + } + + public String getCustomersName() { + return customersName; + } + + public void setCustomersName(String customersName) { + this.customersName = customersName; + } + + public String getCustomersPostcode() { + return customersPostcode; + } + + public void setCustomersPostcode(String customersPostcode) { + this.customersPostcode = customersPostcode; + } + + public String getCustomersState() { + return customersState; + } + + public void setCustomersState(String customersState) { + this.customersState = customersState; + } + + public String getCustomersStreetAddress() { + return customersStreetAddress; + } + + public void setCustomersStreetAddress(String customersStreetAddress) { + this.customersStreetAddress = customersStreetAddress; + } + + public String getCustomersSuburb() { + return customersSuburb; + } + + public void setCustomersSuburb(String customersSuburb) { + this.customersSuburb = customersSuburb; + } + + public String getCustomersTelephone() { + return customersTelephone; + } + + public void setCustomersTelephone(String customersTelephone) { + this.customersTelephone = customersTelephone; + } + + public String getDeliveryCity() { + return deliveryCity; + } + + public void setDeliveryCity(String deliveryCity) { + this.deliveryCity = deliveryCity; + } + + public String getDeliveryCompany() { + return deliveryCompany; + } + + public void setDeliveryCompany(String deliveryCompany) { + this.deliveryCompany = deliveryCompany; + } + + public String getDeliveryName() { + return deliveryName; + } + + public void setDeliveryName(String deliveryName) { + this.deliveryName = deliveryName; + } + + public String getDeliveryPostcode() { + return deliveryPostcode; + } + + public void setDeliveryPostcode(String deliveryPostcode) { + this.deliveryPostcode = deliveryPostcode; + } + + public String getDeliveryState() { + return deliveryState; + } + + public void setDeliveryState(String deliveryState) { + this.deliveryState = deliveryState; + } + + public String getDeliveryStreetAddress() { + return deliveryStreetAddress; + } + + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + this.deliveryStreetAddress = deliveryStreetAddress; + } + + public String getDeliverySuburb() { + return deliverySuburb; + } + + public void setDeliverySuburb(String deliverySuburb) { + this.deliverySuburb = deliverySuburb; + } + + public BigDecimal getOrdersId() { + return ordersId; + } + + public void setOrdersId(BigDecimal ordersId) { + this.ordersId = ordersId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(String paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,106 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; + +import jp.sf.pal.pompei.dxo.OrdersDxo; +import jp.sf.pal.pompei.exentity.Orders; +import jp.sf.pal.pompei.web.admin.order.service.OrderService; + +public class OrderEditAction { + + private static final String MODE_UPDATE = "update"; + /** + * + */ + private OrderEditPage orderEditPage; + private OrderService orderService; + private OrdersDxo ordersDxo; + + + public Class initialize() { + return null; + } + + public Class prerender() { + if(isUpdate()) { + Orders orders = orderService.getOrders(orderEditPage.getOrdersId()); + ordersDxo.convert(orders,orderEditPage); + + }else { + setDummyData(); + } + return null; + } + + private boolean isUpdate() { + if(orderEditPage.getMode() != null && orderEditPage.getMode().equals(MODE_UPDATE)) { + return true; + } + return false; + } + + /** + * テスト用ダミーデータをセットします。 + * + */ + private void setDummyData() { + //顧客 + orderEditPage.setCustomersId(new BigDecimal("1")); + orderEditPage.setCustomersName("山口"); + orderEditPage.setCustomersCompany("N2SM株式会社"); + orderEditPage.setCustomersPostcode("110-0000"); + orderEditPage.setCustomersState("東京都"); + orderEditPage.setCustomersCity("豊島区"); + orderEditPage.setCustomersStreetAddress("999-1122"); + orderEditPage.setCustomersSuburb("なんとかビル9F"); + orderEditPage.setCustomersTelephone("999-9999-9999"); + orderEditPage.setCustomersEmailAddress("hoge****@googl*****"); + //配送先 + orderEditPage.setDeliveryName("山口"); + orderEditPage.setDeliveryCompany("N2SM株式会社"); + orderEditPage.setDeliveryPostcode("110-0000"); + orderEditPage.setDeliveryState("東京都"); + orderEditPage.setDeliveryCity("豊島区"); + orderEditPage.setDeliveryStreetAddress("999-1122"); + orderEditPage.setDeliverySuburb("なんとかビル9F"); + //請求先 + orderEditPage.setBillingName("山口"); + orderEditPage.setBillingCompany("N2SM株式会社"); + orderEditPage.setBillingPostcode("110-0000"); + orderEditPage.setBillingState("東京都"); + orderEditPage.setBillingCity("豊島区"); + orderEditPage.setBillingStreetAddress("999-1122"); + orderEditPage.setBillingSuburb("なんとかビル9F"); + } + + /** + * @return orderEditPage + */ + public OrderEditPage getOrderEditPage() { + return orderEditPage; + } + + /** + * @param orderEditPage 設定する orderEditPage + */ + public void setOrderEditPage(OrderEditPage orderEditPage) { + this.orderEditPage = orderEditPage; + } + + public OrdersDxo getOrdersDxo() { + return ordersDxo; + } + + public void setOrdersDxo(OrdersDxo ordersDxo) { + this.ordersDxo = ordersDxo; + } + + public OrderService getOrderService() { + return orderService; + } + + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,277 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; + +public class OrderEditPage { + + private String mode; + + private String billingCity; + + private String billingCompany; + + private String billingName; + + private String billingPostcode; + + private String billingState; + + private String billingStreetAddress; + + private String billingSuburb; + + private String customersCity; + + private String customersCompany; + + private String customersEmailAddress; + + private BigDecimal customersId; + + private String customersName; + + private String customersPostcode; + + private String customersState; + + private String customersStreetAddress; + + private String customersSuburb; + + private String customersTelephone; + + private String deliveryCity; + + private String deliveryCompany; + + private String deliveryName; + + private String deliveryPostcode; + + private String deliveryState; + + private String deliveryStreetAddress; + + private String deliverySuburb; + + private BigDecimal ordersId; + + private String title; + + public String getBillingCity() { + return billingCity; + } + + public void setBillingCity(String billingCity) { + this.billingCity = billingCity; + } + + public String getBillingCompany() { + return billingCompany; + } + + public void setBillingCompany(String billingCompany) { + this.billingCompany = billingCompany; + } + + public String getBillingName() { + return billingName; + } + + public void setBillingName(String billingName) { + this.billingName = billingName; + } + + public String getBillingPostcode() { + return billingPostcode; + } + + public void setBillingPostcode(String billingPostcode) { + this.billingPostcode = billingPostcode; + } + + public String getBillingState() { + return billingState; + } + + public void setBillingState(String billingState) { + this.billingState = billingState; + } + + public String getBillingStreetAddress() { + return billingStreetAddress; + } + + public void setBillingStreetAddress(String billingStreetAddress) { + this.billingStreetAddress = billingStreetAddress; + } + + public String getBillingSuburb() { + return billingSuburb; + } + + public void setBillingSuburb(String billingSuburb) { + this.billingSuburb = billingSuburb; + } + + public String getCustomersCity() { + return customersCity; + } + + public void setCustomersCity(String customersCity) { + this.customersCity = customersCity; + } + + public String getCustomersCompany() { + return customersCompany; + } + + public void setCustomersCompany(String customersCompany) { + this.customersCompany = customersCompany; + } + + public String getCustomersEmailAddress() { + return customersEmailAddress; + } + + public void setCustomersEmailAddress(String customersEmailAddress) { + this.customersEmailAddress = customersEmailAddress; + } + + public BigDecimal getCustomersId() { + return customersId; + } + + public void setCustomersId(BigDecimal customersId) { + this.customersId = customersId; + } + + public String getCustomersName() { + return customersName; + } + + public void setCustomersName(String customersName) { + this.customersName = customersName; + } + + public String getCustomersPostcode() { + return customersPostcode; + } + + public void setCustomersPostcode(String customersPostcode) { + this.customersPostcode = customersPostcode; + } + + public String getCustomersState() { + return customersState; + } + + public void setCustomersState(String customersState) { + this.customersState = customersState; + } + + public String getCustomersStreetAddress() { + return customersStreetAddress; + } + + public void setCustomersStreetAddress(String customersStreetAddress) { + this.customersStreetAddress = customersStreetAddress; + } + + public String getCustomersSuburb() { + return customersSuburb; + } + + public void setCustomersSuburb(String customersSuburb) { + this.customersSuburb = customersSuburb; + } + + public String getCustomersTelephone() { + return customersTelephone; + } + + public void setCustomersTelephone(String customersTelephone) { + this.customersTelephone = customersTelephone; + } + + public String getDeliveryCity() { + return deliveryCity; + } + + public void setDeliveryCity(String deliveryCity) { + this.deliveryCity = deliveryCity; + } + + public String getDeliveryCompany() { + return deliveryCompany; + } + + public void setDeliveryCompany(String deliveryCompany) { + this.deliveryCompany = deliveryCompany; + } + + public String getDeliveryName() { + return deliveryName; + } + + public void setDeliveryName(String deliveryName) { + this.deliveryName = deliveryName; + } + + public String getDeliveryPostcode() { + return deliveryPostcode; + } + + public void setDeliveryPostcode(String deliveryPostcode) { + this.deliveryPostcode = deliveryPostcode; + } + + public String getDeliveryState() { + return deliveryState; + } + + public void setDeliveryState(String deliveryState) { + this.deliveryState = deliveryState; + } + + public String getDeliveryStreetAddress() { + return deliveryStreetAddress; + } + + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + this.deliveryStreetAddress = deliveryStreetAddress; + } + + public String getDeliverySuburb() { + return deliverySuburb; + } + + public void setDeliverySuburb(String deliverySuburb) { + this.deliverySuburb = deliverySuburb; + } + + public BigDecimal getOrdersId() { + return ordersId; + } + + public void setOrdersId(BigDecimal ordersId) { + this.ordersId = ordersId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,99 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import sun.nio.cs.ext.ISCII91; + +import jp.sf.pal.pompei.dxo.OrdersDxo; +import jp.sf.pal.pompei.exentity.Orders; +import jp.sf.pal.pompei.exentity.OrdersStatus; +import jp.sf.pal.pompei.web.admin.order.service.OrderService; + +public class OrderListAction { + + /** + * + */ + private OrderListPage orderListPage; + + private OrderService orderService; + + private OrdersDxo ordersDxo; + + public Class initialize() { + return null; + } + + public Class prerender() { + + if(orderListPage.isCancel()) { + Orders orders = orderService.getOrders(orderListPage.getOrdersId()); + orders.setOrdersStatusId(new BigDecimal("5")); + orderService.updateOrders(orders); + } + + List<Orders> list = orderService.getOrdersList(); + List<Map> items = ordersDxo.convert(list); + orderListPage.setOrderItems(items); + return null; + } + +// private List<Map> createOrderItemsStub() { +// List list = new ArrayList(); +// Map m = null; +// for(int i=0;i<10;i++) { +// m = new HashMap(); +// m.put("ordersId", new BigDecimal(i)); +// m.put("customersId", new BigDecimal(i*10)); +// m.put("customersName", "山口"); +// m.put("customersState", "東京都"); +// m.put("customersCity", "豊島区"); +// m.put("ordersStatus", "未処理"); +// list.add(m); +// } +// return list; +// } + + /** + * 注文を検索します。 + * @return + */ + public Class doSearch() { + return null; + } + + /** + * @return orderListPage + */ + public OrderListPage getOrderListPage() { + return orderListPage; + } + + /** + * @param orderListPage 設定する orderListPage + */ + public void setOrderListPage(OrderListPage orderListPage) { + this.orderListPage = orderListPage; + } + + public OrderService getOrderService() { + return orderService; + } + + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + + public OrdersDxo getOrdersDxo() { + return ordersDxo; + } + + public void setOrdersDxo(OrdersDxo ordersDxo) { + this.ordersDxo = ordersDxo; + } + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,117 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.math.BigDecimal; +import java.util.List; + +public class OrderListPage { + + private boolean cancel; + + private String customersCity; + + private BigDecimal customersId; + + private String customersName; + + private String customersState; + + private String dateTo; + + private int orderIndex; + + private List orderItems; + + private BigDecimal ordersId; + + private String ordersStatus; + + private String title; + + public String getCustomersCity() { + return customersCity; + } + + public void setCustomersCity(String customersCity) { + this.customersCity = customersCity; + } + + public BigDecimal getCustomersId() { + return customersId; + } + + public void setCustomersId(BigDecimal customersId) { + this.customersId = customersId; + } + + public String getCustomersName() { + return customersName; + } + + public void setCustomersName(String customersName) { + this.customersName = customersName; + } + + public String getCustomersState() { + return customersState; + } + + public void setCustomersState(String customersState) { + this.customersState = customersState; + } + + public String getDateTo() { + return dateTo; + } + + public void setDateTo(String dateTo) { + this.dateTo = dateTo; + } + + public int getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(int orderIndex) { + this.orderIndex = orderIndex; + } + + public List getOrderItems() { + return orderItems; + } + + public void setOrderItems(List orderItems) { + this.orderItems = orderItems; + } + + public BigDecimal getOrdersId() { + return ordersId; + } + + public void setOrdersId(BigDecimal ordersId) { + this.ordersId = ordersId; + } + + public String getOrdersStatus() { + return ordersStatus; + } + + public void setOrdersStatus(String ordersStatus) { + this.ordersStatus = ordersStatus; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isCancel() { + return cancel; + } + + public void setCancel(boolean cancel) { + this.cancel = cancel; + } +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/OrderService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/OrderService.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/OrderService.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,16 @@ +package jp.sf.pal.pompei.web.admin.order.service; + +import java.math.BigDecimal; +import java.util.List; + +import jp.sf.pal.pompei.exentity.Orders; + +public interface OrderService { + + Orders getOrders(BigDecimal ordersId); + + void updateOrders(Orders orders); + + List<Orders> getOrdersList(); + +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/impl/OrderServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/impl/OrderServiceImpl.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/service/impl/OrderServiceImpl.java 2007-07-27 18:43:53 UTC (rev 396) @@ -0,0 +1,40 @@ +package jp.sf.pal.pompei.web.admin.order.service.impl; + +import java.math.BigDecimal; +import java.util.List; + +import jp.sf.pal.pompei.cbean.OrdersCB; +import jp.sf.pal.pompei.exbhv.OrdersBhv; +import jp.sf.pal.pompei.exentity.Orders; +import jp.sf.pal.pompei.web.admin.order.service.OrderService; + +public class OrderServiceImpl implements OrderService { + + OrdersBhv ordersBhv; + + public List<Orders> getOrdersList() { + OrdersCB ordersCB = new OrdersCB(); + ordersCB.setupSelect_OrdersStatus(); + ordersCB.query().queryOrdersStatus().setLanguageId_Equal(new BigDecimal("1")); + return ordersBhv.selectList(ordersCB); + } + + public Orders getOrders(BigDecimal ordersId) { + OrdersCB ordersCB = new OrdersCB(); + ordersCB.query().setOrdersId_Equal(ordersId); + return ordersBhv.selectEntity(ordersCB); + } + + public void updateOrders(Orders orders) { + ordersBhv.insertOrUpdate(orders); + } + + public OrdersBhv getOrdersBhv() { + return ordersBhv; + } + + public void setOrdersBhv(OrdersBhv ordersBhv) { + this.ordersBhv = ordersBhv; + } + +} Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java 2007-07-27 18:43:53 UTC (rev 396) @@ -28,12 +28,10 @@ public Class initialize() { - System.out.println("ProductListAction:initialize"); return null; } public Class prerender() { - System.out.println("ProductListAction:prerender"); if(productListPage.isDelete()) { productService.deleteProducts(productListPage.getProductsId()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java 2007-07-27 18:43:53 UTC (rev 396) @@ -14,7 +14,7 @@ private BigDecimal targetId; - boolean delete; + private boolean delete; @SubapplicationScope private BigDecimal parentId; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/ProductService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/ProductService.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/ProductService.java 2007-07-27 18:43:53 UTC (rev 396) @@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.util.List; +import jp.sf.pal.pompei.exentity.Manufacturers; import jp.sf.pal.pompei.exentity.ProductsDescription; public interface ProductService { @@ -19,4 +20,6 @@ public void updateProducts(ProductsDescription description); + public Manufacturers getManufacturers(BigDecimal manufacturersId); + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/impl/ProductServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/impl/ProductServiceImpl.java 2007-07-27 18:42:00 UTC (rev 395) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/service/impl/ProductServiceImpl.java 2007-07-27 18:43:53 UTC (rev 396) @@ -6,11 +6,14 @@ import java.util.Date; import java.util.List; +import jp.sf.pal.pompei.cbean.ManufacturersCB; import jp.sf.pal.pompei.cbean.ProductsDescriptionCB; import jp.sf.pal.pompei.cbean.ProductsToCategoriesCB; +import jp.sf.pal.pompei.exbhv.ManufacturersBhv; import jp.sf.pal.pompei.exbhv.ProductsBhv; import jp.sf.pal.pompei.exbhv.ProductsDescriptionBhv; import jp.sf.pal.pompei.exbhv.ProductsToCategoriesBhv; +import jp.sf.pal.pompei.exentity.Manufacturers; import jp.sf.pal.pompei.exentity.Products; import jp.sf.pal.pompei.exentity.ProductsDescription; import jp.sf.pal.pompei.exentity.ProductsToCategories; @@ -21,6 +24,7 @@ private ProductsDescriptionBhv productsDescriptionBhv; private ProductsBhv productsBhv; private ProductsToCategoriesBhv productsToCategoriesBhv; + private ManufacturersBhv manufacturersBhv; public void addProducts(ProductsDescription description, BigDecimal categoriesId) { @@ -56,6 +60,7 @@ public ProductsDescription getProdcutsDescription(BigDecimal id) { ProductsDescriptionCB descriptionCB = new ProductsDescriptionCB(); descriptionCB.setupSelect_Products(); + descriptionCB.query().setLanguageId_Equal(new BigDecimal("1")); descriptionCB.query().setProductsId_Equal(id); return productsDescriptionBhv.selectEntity(descriptionCB); @@ -115,4 +120,19 @@ this.productsToCategoriesBhv = productsToCategoriesBhv; } + public Manufacturers getManufacturers(BigDecimal manufacturersId) { + ManufacturersCB manufacturersCB = new ManufacturersCB(); + manufacturersCB.query().setManufacturersId_Equal(manufacturersId); + + return manufacturersBhv.selectEntity(manufacturersCB); + } + + public ManufacturersBhv getManufacturersBhv() { + return manufacturersBhv; + } + + public void setManufacturersBhv(ManufacturersBhv manufacturersBhv) { + this.manufacturersBhv = manufacturersBhv; + } + }