merge app

src/main/java/Recipe/createRecipe.java

@@ -0,0 +1,174 @@
+package Recipe;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import Recipe.model.MateralBean;
+import Recipe.model.MethodBean;
+import Recipe.model.RecipeBean;
+import Recipe.service.MateralService;
+import Recipe.service.MethodService;
+import Recipe.service.RecipeService;
+import createAccount.model.MemberBean;
+
+public class createRecipe {
+	public static final String UTF8_BOM = "\uFEFF"; // 定義 UTF-8的BOM字元
+	private static ApplicationContext ctx;
+
+	public static void main(String[] args) throws IOException, SQLException, ParseException {
+
+		ctx = new ClassPathXmlApplicationContext("beans.xml");
+		SessionFactory factory = ctx.getBean(SessionFactory.class);
+		Session session = factory.getCurrentSession();
+
+		RecipeService recipeService = ctx.getBean(RecipeService.class);
+		MateralService materalService = ctx.getBean(MateralService.class);
+//		MethodService methodService = ctx.getBean(MethodService.class);
+
+		File file = new File("C:/ezfitData/createTable/recipe.data");
+		File file2 = new File("C:/ezfitData/createTable/method.data");
+		File file3 = new File("C:/ezfitData/createTable/materal.data");
+//		File file = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/recipe.data");
+//		File file2 = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/method.data");
+//		File file3 = new File("C:/Users/tmps8/Desktop/ezfitData/createTable/materal.data");
+
+		int n = 0;
+		String line = "";
+
+		Transaction tx = session.beginTransaction();
+//		recipe
+		try (FileInputStream fis = new FileInputStream(file);
+				InputStreamReader isr = new InputStreamReader(fis, "UTF8");
+				BufferedReader br = new BufferedReader(isr);) {
+
+				MemberBean mb = new MemberBean();
+				session.save(mb);
+
+			while ((line = br.readLine()) != null) {
+				System.out.println("line=" + line);
+				// 去除 UTF8_BOM: \uFEFF
+//				if (line.startsWith(UTF8_BOM)) {
+//					line = line.substring(1);
+				try {
+
+					String[] token = line.split("\\|");
+					RecipeBean recipe = new RecipeBean();
+					recipe.setChat(Integer.parseInt(token[0]));
+					recipe.setFileName(token[1]);
+					recipe.setGood(Integer.parseInt(token[2]));
+					recipe.setIntroduction(token[3]);
+					recipe.setPublished(Boolean.valueOf(token[4]));
+					recipe.setRecipeName(token[5]);
+					recipe.setSave(Integer.parseInt(token[6]));
+					recipe.setServings(Integer.parseInt(token[7]));
+					recipe.setSpendTime((token[8]));
+//					recipe.setMember(recipeDao.getMemberBeanByMemberId(token[9]));
+					recipe.setMember(recipeService.getMemberByMemberId(token[9]));
+
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					Date date = sdf.parse("2019-11-11 10:54:17.943000");
+					recipe.setRecipeCreateTime(date);
+//					session.save(recipe);
+					recipeService.insertRecipe(recipe);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				++n;
+//				}
+			}
+			tx.commit();
+			System.out.println("新增Recipe紀錄，共成功=" + n);
+		}
+
+//		method
+		List<MethodBean> list = new ArrayList<>();
+		line = "";
+		factory = ctx.getBean(SessionFactory.class);
+		session = factory.getCurrentSession();
+		tx = session.beginTransaction();
+		try (FileInputStream fis = new FileInputStream(file2);
+				InputStreamReader isr = new InputStreamReader(fis, "UTF8");
+				BufferedReader br = new BufferedReader(isr);) {
+
+			while ((line = br.readLine()) != null) {
+				System.out.println("line=" + line);
+				// 去除 UTF8_BOM: \uFEFF
+//				if (line.startsWith(UTF8_BOM)) {
+//					line = line.substring(1);
+
+				String[] token = line.split("\\|");
+				MethodBean method = new MethodBean();
+				method.setDetail(token[0]);
+				method.setFileName(token[1]);
+				RecipeBean recipe = new RecipeBean();
+				recipe.setRecipeId(Integer.parseInt(token[2]));
+				method.setRecipe(recipe);
+
+//					session.save(method);
+//				list.add(method);
+				++n;
+				session.save(method);
+//				}
+//				methodService.insertMethod(list);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+//		tx.commit();
+		System.out.println("新增Method紀錄，共成功=" + n);
+
+//		materal
+//		factory = ctx.getBean(SessionFactory.class);
+//		session = factory.getCurrentSession();
+//		tx = session.beginTransaction();
+		line = "";
+//		tx = session.beginTransaction();
+		try (FileInputStream fis = new FileInputStream(file3);
+				InputStreamReader isr = new InputStreamReader(fis, "UTF8");
+				BufferedReader br = new BufferedReader(isr);) {
+
+			while ((line = br.readLine()) != null) {
+				System.out.println("line=" + line);
+				// 去除 UTF8_BOM: \uFEFF
+//				if (line.startsWith(UTF8_BOM)) {
+//					line = line.substring(1);
+
+				String[] token = line.split("\\|");
+				MateralBean materal = new MateralBean();
+				materal.setMateralName(token[0]);
+				materal.setUnit(token[1]);
+
+				RecipeBean recipe = new RecipeBean();
+				recipe.setRecipeId(Integer.valueOf(token[2]));
+				materal.setRecipe(recipe);
+
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				Date date = sdf.parse("2019-11-11 10:54:17.943000");
+				recipe.setRecipeCreateTime(date);
+
+				materalService.insertMateral(materal);
+				++n;
+
+//				}
+			}
+			System.out.println("新增Materal紀錄，共成功=" + n);
+		}
+		tx.commit();
+	}
+
+}

src/main/java/login/controller/Member.java

@@ -678,7 +678,7 @@ public String updatePwdAPI(Model model, HttpServletRequest request, HttpServletR
 
 	}
 
-//	拿取會員資料
+//	拿取會員資料(App)
 	@RequestMapping(value = "/api/mobile/memberInfo", method = RequestMethod.POST, produces = "application/json;charset=utf-8")
 	public @ResponseBody String memberInfo(@RequestParam("memberEmail") String memberEmail,
 			@RequestParam("memberPassword") String memberPassword, HttpServletRequest request,

src/main/java/shopping/controller/Mall.java

@@ -1210,6 +1210,145 @@ public String groupBuyJoin(@PathVariable("group") String group, HttpServletReque
 		String json = new ToJson<Map<String, String>>().getJson(status);
 		return json;
 	}
+
+
+	// 購物車結帳商品(個人App)
+			@RequestMapping(value = "api/shopCartApp/bill", produces = "application/json;charset=utf-8", method = RequestMethod.POST)
+			public @ResponseBody String billCartItemApp(
+					@RequestParam("memberEmail") String email,
+					@RequestParam("memberPassword") String password,
+					@RequestParam("subscriberName") String subscriberName,
+					@RequestParam("subscriberPhone") String subscriberPhone,
+					@RequestParam("subscriberEmail") String subscriberEmail,
+					@RequestParam("subscribercity") String subscriberCity,
+					@RequestParam("subscriberdistrict") String subscriberDistrict,
+					@RequestParam("subscriberzipCode") String subscriberZipCode,
+					@RequestParam("subscriberAddress") String subscriberAddress,
+					@RequestParam("name") String shippingName,
+					@RequestParam("phone") String shippingPhone,
+					@RequestParam("county") String shippingCity,
+					@RequestParam("district") String shippingDistrict,
+					@RequestParam("zipcode") String shippingZipCode,
+					@RequestParam("address") String shippingAddress,
+					HttpServletRequest req) {
+
+				System.out.println("購物車結帳商品(個人App) api/shopCartApp/bill 測試.....");
+				System.out.println("email = " + email);
+				System.out.println("password = " + password);
+				System.out.println("subscriberName = " + subscriberName);
+				System.out.println("subscriberPhone = " + subscriberPhone);
+				System.out.println("subscriberEmail = " + subscriberEmail);
+				System.out.println("subscriberCity = " + subscriberCity);
+				System.out.println("subscriberDistrict = " + subscriberDistrict);
+				System.out.println("subscriberZipCode = " + subscriberZipCode);
+				System.out.println("subscriberAddress = " + subscriberAddress);
+				System.out.println("shippingName = " + shippingName);
+				System.out.println("shippingPhone = " + shippingPhone);
+				System.out.println("shippingCity = " + shippingCity);
+				System.out.println("shippingDistrict = " + shippingDistrict);
+				System.out.println("shippingZipCode = " + shippingZipCode);
+				System.out.println("shippingAddress = " + shippingAddress);
+
+				password = EncrypAES.getMD5Endocing(EncrypAES.encryptString(password));
+				MemberBean memberBean = null;
+				memberBean = loginService.checkIDPassword(email, password);
+
+				totalAmount = 0;
+				Map<String, String> errorMsg = new HashMap<String, String>();
+
+
+				if (subscriberName.trim() == "") {
+					errorMsg.put("errorSubName", "請輸入購買人姓名");
+				}
+
+				if (subscriberPhone.trim() == "") {
+					errorMsg.put("errorSubPhone", "請輸入購買人手機號碼");
+				} else if (!(subscriberPhone.length() == 10) || !StringUtils.isNumeric(subscriberPhone)) {
+					errorMsg.put("errorSubPhone", "手機號碼為10位數字");
+				}
+
+				if (subscriberEmail.trim() == "") {
+					errorMsg.put("errorSubEmail", "請輸入購買人信箱");
+				}
+
+				if (subscriberAddress.trim() == "") {
+					errorMsg.put("errorSubAddress", "請輸入購買人地址");
+				}
+
+				if (shippingName.trim() == "") {
+					errorMsg.put("errorShipName", "請輸入收件人姓名");
+				}
+
+				if (shippingPhone.trim() == "") {
+					errorMsg.put("errorShipPhone", "請輸入收件人電話");
+				} else if (!(shippingPhone.length() == 10) || !StringUtils.isNumeric(shippingPhone)) {
+					errorMsg.put("errorShipPhone", "手機號碼為10位數字");
+				}
+
+				if (shippingAddress.trim() == "") {
+					errorMsg.put("errorShipAddress", "請輸入收件人地址");
+				}
+
+				if (errorMsg.size() > 0) {
+					Gson gson = new Gson();
+					String eMsg = gson.toJson(errorMsg);
+					return eMsg;
+				} else {
+
+					orderBean = new OrderBean();
+					orderItemBeans = new ArrayList<OrderItemBean>();
+					orderBean.setShippingAddress(shippingAddress);
+					orderBean.setShippingCity(shippingCity);
+					orderBean.setShippingDistrict(shippingDistrict);
+					orderBean.setShippingName(shippingName);
+					orderBean.setShippingPhone(shippingPhone);
+					orderBean.setSubscriberAddress(subscriberAddress);
+					orderBean.setSubscriberCity(subscriberCity);
+					orderBean.setSubscriberDistrict(subscriberDistrict);
+					orderBean.setSubscriberEmail(subscriberEmail);
+					orderBean.setSubscriberName(subscriberName);
+					orderBean.setSubscriberPhone(subscriberPhone);
+					orderBean.setSubscriberZipCode(subscriberZipCode);
+					orderBean.setShippingZipCode(shippingZipCode);
+					orderBean.setGroupBuyBean(null);
+					if (memberBean != null) {
+						cartItems = cartItemService.checkAllItems(memberBean);
+						for (Iterator iterator = cartItems.iterator(); iterator.hasNext();) {
+							OrderItemBean orderItemBean = new OrderItemBean();
+							cartItem = (CartItem) iterator.next();
+							if (cartItem.getPlaneItems() != null && cartItem.getPlaneItems().size() != 0) {
+								List<OrderPlaneItem> orderPlaneItems = new ArrayList<OrderPlaneItem>();
+								List<PlaneItem> planeItems = cartItem.getPlaneItems();
+								for (Iterator iterator2 = planeItems.iterator(); iterator2.hasNext();) {
+									PlaneItem planeItem = (PlaneItem) iterator2.next();
+									OrderPlaneItem orderPlaneItem = new OrderPlaneItem();
+									orderPlaneItem.setCuisineProduct(planeItem.getCuisineProduct());
+									orderPlaneItems.add(orderPlaneItem);
+								}
+								orderItemBean.setShipDate(cartItem.getShipDate());
+								orderItemBean.setPlaneItems(orderPlaneItems);
+								totalAmount += 90;
+							}
+
+							orderItemBean.setQty(cartItem.getQty());
+							orderItemBean.setSubTotal(cartItem.getSubTotal());
+							orderItemBean.setProduct(cartItem.getProduct());
+							orderItemBeans.add(orderItemBean);
+							totalAmount += cartItem.getSubTotal();
+							cartItemService.remove(cartItem.getProduct().getId(), memberBean);
+						}
+						orderBean.setTotalAmount(totalAmount);
+						Timestamp ts = new java.sql.Timestamp(System.currentTimeMillis());
+						orderBean.setOrderItemBeans(orderItemBeans);
+						orderBean.setCreateTime(ts);
+						orderBean.setMemberBean(memberBean);
+						orderService.save(orderBean);
+
+						return null;
+					}
+				}
+				return null;
+			}
 
 	// 食材加入購物車 (非團購App)
 	@RequestMapping(value = "api/shopCartApp/add", method = RequestMethod.POST, produces = "application/json;charset=utf-8")

src/main/resources/beans.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
-	<context:component-scan base-package="shopping,createAccount,login"></context:component-scan>
+	<context:component-scan base-package="shopping,createAccount,login,Recipe"></context:component-scan>
 
 
 	<bean id="dataSourceMySQL"