diff --git a/fx_order_provider/pom.xml b/fx_order_provider/pom.xml
index fb9c12f..1ff194b 100644
--- a/fx_order_provider/pom.xml
+++ b/fx_order_provider/pom.xml
@@ -58,6 +58,11 @@
org.springframework.boot
spring-boot-starter-data-redis
+
+ com.zm
+ fx_util_common
+ 0.0.1-SNAPSHOT
+
diff --git a/fx_order_provider/src/main/java/com/zm/fx_order_provider/constant/OrderConstant.java b/fx_order_provider/src/main/java/com/zm/fx_order_provider/constant/OrderConstant.java
new file mode 100644
index 0000000..64d14a1
--- /dev/null
+++ b/fx_order_provider/src/main/java/com/zm/fx_order_provider/constant/OrderConstant.java
@@ -0,0 +1,20 @@
+package com.zm.fx_order_provider.constant;
+
+/**
+ * @Describle This Class Is
+ * @Author ZengMin
+ * @Date 2018/12/8 16:20
+ * @Company Matt
+ */
+public class OrderConstant {
+
+ public static final int ORDER_CREATE = 1; //订单创建
+
+ public static final int ORDER_OUTTIME = 2; //订单超时
+
+ public static final int ORDER_CLOSE = 3; //订单关闭
+
+ public static final int ORDER_SUCCESS = 0; //订单成功
+
+
+}
diff --git a/fx_order_provider/src/main/java/com/zm/fx_order_provider/controller/OrderController.java b/fx_order_provider/src/main/java/com/zm/fx_order_provider/controller/OrderController.java
index 8393026..99d603f 100644
--- a/fx_order_provider/src/main/java/com/zm/fx_order_provider/controller/OrderController.java
+++ b/fx_order_provider/src/main/java/com/zm/fx_order_provider/controller/OrderController.java
@@ -2,6 +2,7 @@
import com.zm.fx_order_provider.service.OrderService;
import com.zm.fx_util_common.bean.OrderDetail;
+import com.zm.fx_util_common.util.MapUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +22,14 @@ public class OrderController {
OrderService orderService;
@PostMapping("/order/addOrder")
- public Map addOrder(@RequestBody OrderDetail orderDetail){
+ public Map addOrder(@RequestBody OrderDetail orderDetail){
boolean b = orderService.addOrder(orderDetail);
- return null;
+ if(b){
+ return MapUtil.ResponseSuccess();
+ }
+ return MapUtil.ResponseError();
}
+
+
}
diff --git a/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/OrderService.java b/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/OrderService.java
index cb54d78..faab132 100644
--- a/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/OrderService.java
+++ b/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/OrderService.java
@@ -1,5 +1,6 @@
package com.zm.fx_order_provider.service;
+
import com.zm.fx_util_common.bean.OrderDetail;
/**
diff --git a/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/impl/OrderServiceImpl.java b/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/impl/OrderServiceImpl.java
index af03991..20cd3fa 100644
--- a/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/impl/OrderServiceImpl.java
+++ b/fx_order_provider/src/main/java/com/zm/fx_order_provider/service/impl/OrderServiceImpl.java
@@ -1,10 +1,25 @@
package com.zm.fx_order_provider.service.impl;
+import com.zm.fx_dao_common.bean.Item;
+import com.zm.fx_dao_common.bean.Order;
+import com.zm.fx_dao_common.bean.OrderItem;
+import com.zm.fx_dao_common.dao.ItemMapper;
+import com.zm.fx_dao_common.dao.OrderDetailMapper;
+import com.zm.fx_dao_common.dao.OrderItemMapper;
import com.zm.fx_dao_common.dao.OrderMapper;
+import com.zm.fx_order_provider.constant.OrderConstant;
import com.zm.fx_order_provider.service.OrderService;
import com.zm.fx_util_common.bean.OrderDetail;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @Describle This Class Is
@@ -13,13 +28,114 @@
* @Company Matt
*/
@Service
+@Transactional
public class OrderServiceImpl implements OrderService {
+ @Autowired
+ OrderDetailMapper orderDetailMapper;
+
@Autowired
OrderMapper orderMapper;
+ @Autowired
+ ItemMapper itemMapper;
+
+ @Autowired
+ OrderItemMapper orderItemMapper;
+
+ static NumberFormat numberFormat = NumberFormat.getNumberInstance();
+
+ static {
+ numberFormat.setMaximumFractionDigits(2);
+ }
+
@Override
public boolean addOrder(OrderDetail orderDetail) {
+ String itemid = orderDetail.getItemid();
+ Double allPrice = 0.0;
+ Map items = new HashMap<>();
+ if (itemid.indexOf(",") != -1) {
+ //取商品信息
+ String[] itemIds = itemid.split(",");
+ for (String i : itemIds) {
+ //从购物车取订单信息
+
+
+// allPrice += item.getPrice();
+// items.put(i,item);
+ }
+ } else {
+ //取商品信息
+ Item item = itemMapper.selectByPrimaryKey(Long.valueOf(itemid));
+ allPrice = item.getPrice();
+ items.put(itemid,item);
+ }
+
+ Long userId = orderDetail.getUserid();
+
+ //生成订单编号
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssmm");
+ String dateMils = simpleDateFormat.format(new Date());
+ String orderId = dateMils + "" + (int) (userId / 2) + "" + (int) (Math.random() * 1000);
+
+ //保存订单表
+ Order order = new Order();
+ order.setId(Long.valueOf(orderId));
+ order.setNowprice(allPrice);
+ order.setAllprice(allPrice);
+ order.setPayway(orderDetail.getType());
+ order.setCreated(new Date());
+ order.setStarttime(new Date());
+ order.setStatus(OrderConstant.ORDER_CREATE);
+ order.setUpdated(new Date());
+ order.setUserid(userId);
+ orderMapper.insertSelective(order);
+
+ //订单详细表
+ com.zm.fx_dao_common.bean.OrderDetail daoOd = new com.zm.fx_dao_common.bean.OrderDetail();
+ daoOd.setCreated(new Date());
+ daoOd.setOrderid(Long.valueOf(orderId));
+ daoOd.setUserid(userId);
+ daoOd.setUsername(orderDetail.getUsername());
+ daoOd.setUseraddress(orderDetail.getAddressid());
+ daoOd.setUserphone(orderDetail.getUserphone());
+ daoOd.setCreated(new Date());
+ orderDetailMapper.insert(daoOd);
+
+ if (itemid.indexOf(",") != -1) {
+ for (String itemId : itemid.split(",")) {
+ //取单个商品信息
+ Object o = items.get(itemId);
+ Item item = (Item) o;
+
+ OrderItem orderItem = new OrderItem();
+ orderItem.setOrderid(Long.valueOf(orderId));
+ orderItem.setAllpruce(allPrice);
+ orderItem.setCreated(new Date());
+ orderItem.setIsreceive(0);
+ orderItem.setItemname(item.getName());
+ orderItem.setImg(item.getImgurl());
+ orderItem.setItemdesc(item.getDescrible());
+ orderItem.setItemid(Long.valueOf(item.getId()));
+ orderItem.setNum(0); //从购物车取
+
+ }
+ }
+
+
return false;
}
+
+
+ @Test
+ public void test() {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssmm");
+ Long userId = 1231232131232L;
+ String dateMils = simpleDateFormat.format(new Date());
+ String temp = userId + "" + dateMils;
+ System.out.println();
+
+
+ }
+
}
diff --git a/fx_util_common/src/main/java/com/zm/fx_util_common/util/MapUtil.java b/fx_util_common/src/main/java/com/zm/fx_util_common/util/MapUtil.java
new file mode 100644
index 0000000..a00590a
--- /dev/null
+++ b/fx_util_common/src/main/java/com/zm/fx_util_common/util/MapUtil.java
@@ -0,0 +1,46 @@
+package com.zm.fx_util_common.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Describle This Class Is
+ * @Author ZengMin
+ * @Date 2018/12/8 14:57
+ * @Company Matt
+ */
+@Component
+public class MapUtil {
+
+ public static Map packMap(String k,Object v){
+ Map map = new HashMap<>();
+ map.put(k,v);
+ return map;
+ }
+
+ public static Map ResponseSuccess(){
+ Map map = new HashMap<>();
+ map.put("code",200);
+ map.put("msg","成功");
+ return map;
+ }
+
+
+ public static Map ResponseError(){
+ Map map = new HashMap<>();
+ map.put("code",200);
+ map.put("msg","成功");
+ return map;
+ }
+
+ public static Map ResponseError(int code,String msg){
+ Map map = new HashMap<>();
+ map.put("code",code);
+ map.put("msg",msg);
+ return map;
+ }
+
+
+}
diff --git a/fx_web_admin/pom.xml b/fx_web_admin/pom.xml
index 446df15..f89bc11 100644
--- a/fx_web_admin/pom.xml
+++ b/fx_web_admin/pom.xml
@@ -62,6 +62,11 @@
org.springframework.boot
spring-boot-starter-data-redis
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+ 2.0.2.RELEASE
+
diff --git a/fx_web_admin/src/main/java/com/zm/fx_web_admin/controller/RefreOrderController.java b/fx_web_admin/src/main/java/com/zm/fx_web_admin/controller/RefreOrderController.java
index 482b3a7..a67cf63 100644
--- a/fx_web_admin/src/main/java/com/zm/fx_web_admin/controller/RefreOrderController.java
+++ b/fx_web_admin/src/main/java/com/zm/fx_web_admin/controller/RefreOrderController.java
@@ -1,12 +1,12 @@
package com.zm.fx_web_admin.controller;
import com.zm.fx_util_common.bean.OrderDetail;
+import com.zm.fx_util_common.util.MapUtil;
import com.zm.fx_web_admin.service.RefreOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
-
import java.util.Map;
/**
@@ -31,8 +31,8 @@ public String toOrderAddress(@RequestParam String ids, Model model,String userid
@PostMapping("/addOrder")
@ResponseBody
- public Map addOrder(OrderDetail orderDetail){
+ public Map addOrder(OrderDetail orderDetail){
refreOrderServcie.addOrder(orderDetail);
- return null;
+ return MapUtil.ResponseSuccess();
}
}
diff --git a/fx_web_admin/src/main/java/com/zm/fx_web_admin/service/RefreOrderService.java b/fx_web_admin/src/main/java/com/zm/fx_web_admin/service/RefreOrderService.java
index 368bc81..463598e 100644
--- a/fx_web_admin/src/main/java/com/zm/fx_web_admin/service/RefreOrderService.java
+++ b/fx_web_admin/src/main/java/com/zm/fx_web_admin/service/RefreOrderService.java
@@ -1,13 +1,10 @@
package com.zm.fx_web_admin.service;
-import com.alibaba.fastjson.JSONObject;
import com.zm.fx_util_common.bean.OrderDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import java.util.HashMap;
-
/**
* @Describle This Class Is
* @Author ZengMin
@@ -22,6 +19,5 @@ public class RefreOrderService {
public void addOrder(OrderDetail orderDetail) {
String result = restTemplate.postForObject("http://FXORDERROVIDER/order/addOrder", orderDetail, String.class);
- HashMap hashMap = JSONObject.parseObject(result, HashMap.class);
}
}
diff --git a/fx_web_admin/src/main/resources/static/images/alipay.ico b/fx_web_admin/src/main/resources/static/images/alipay.ico
new file mode 100644
index 0000000..539c0ca
Binary files /dev/null and b/fx_web_admin/src/main/resources/static/images/alipay.ico differ
diff --git a/fx_web_admin/src/main/resources/static/images/qqpay.ico b/fx_web_admin/src/main/resources/static/images/qqpay.ico
new file mode 100644
index 0000000..7097f55
Binary files /dev/null and b/fx_web_admin/src/main/resources/static/images/qqpay.ico differ
diff --git a/fx_web_admin/src/main/resources/static/images/wechat.ico b/fx_web_admin/src/main/resources/static/images/wechat.ico
new file mode 100644
index 0000000..3ed86a5
Binary files /dev/null and b/fx_web_admin/src/main/resources/static/images/wechat.ico differ
diff --git a/fx_web_admin/src/main/resources/static/plugins/layui/js/order.js b/fx_web_admin/src/main/resources/static/plugins/layui/js/order.js
new file mode 100644
index 0000000..c725037
--- /dev/null
+++ b/fx_web_admin/src/main/resources/static/plugins/layui/js/order.js
@@ -0,0 +1,39 @@
+$(function () {
+ $("#paybtn").click(function () {
+ var userid = $("#userid").text();
+ var itemids = $("#itemids").text();
+ var payway = $("#payform").serialize();
+ if(payway == ""){
+ alert("请选择支付方式！");
+ return;
+ }
+ if(itemids == ""){
+ alert("请选择商品！");
+ return;
+ }
+ var order = {};
+ $.each($(".Address_info"),function (index,item) {
+ if($(item).attr("check") == "1"){
+ var li = $(item).find("li");
+ $.each(li,function (lIndex,lItem) {
+ var key = $(lItem).attr("field");
+ var value =$(lItem).text();
+ order[key] = value;
+ });
+ }
+ });
+ var split = payway.split("=");
+ order[split[0]] = split[1];
+ order.itemid = itemids;
+ order.userid = userid;
+ $.post("/order/addOrder",order,function (result) {
+
+ });
+ console.log(order)
+ });
+
+
+
+
+
+});
\ No newline at end of file
diff --git a/fx_web_admin/src/main/resources/templates/error/5xx.html b/fx_web_admin/src/main/resources/templates/error/5xx.html
new file mode 100644
index 0000000..42455ae
--- /dev/null
+++ b/fx_web_admin/src/main/resources/templates/error/5xx.html
@@ -0,0 +1,6 @@
+
+
+ 500 SERVICE UNABLED
+
+
+
\ No newline at end of file
diff --git a/fx_web_admin/src/main/resources/templates/fxshop/index.html b/fx_web_admin/src/main/resources/templates/fxshop/index.html
index 279e846..f46fb0d 100644
--- a/fx_web_admin/src/main/resources/templates/fxshop/index.html
+++ b/fx_web_admin/src/main/resources/templates/fxshop/index.html
@@ -30,7 +30,7 @@
$("div[class='p_f_name infonav_hidden']").eq(index).animate({height:infonav_height});
$(".infonav_more").eq(index).replaceWith(' 更多
');
}
-
+
function onclick(event) {
info_more_down();
return false;
@@ -125,7 +125,7 @@
立即购买
@@ -133,7 +133,7 @@ ￥124.00
烟花烫女装气质修身显瘦连衣裙套装
-
￥124.00
+
￥124.00
立即购买
@@ -141,7 +141,7 @@ ￥124.00
立即购买
@@ -149,7 +149,7 @@ ￥124.00
立即购买
@@ -157,7 +157,7 @@ ￥1124.00
立即购买
@@ -165,7 +165,7 @@ ￥1124.00
立即购买
@@ -173,7 +173,7 @@ ￥1124.00
立即购买
@@ -181,12 +181,12 @@ ￥1124.00
立即购买
-
+
@@ -198,7 +198,7 @@ ￥1124.00
大品牌，大智慧
优质品牌，精选品牌
-
+
- 
+ 
@@ -321,7 +321,7 @@ 
