优化下单及前端页面

2227324689 · 2227324689 · commit 424518ddb0f0 · 2019-08-12T22:47:33.000+08:00
diff --git a/gpmall-front/package-lock.json b/gpmall-front/package-lock.json
diff --git a/gpmall-front/package.json b/gpmall-front/package.json
@@ -18,6 +18,7 @@
     "gitment": "0.0.3",
     "mockjs": "^1.0.1-beta3",
     "vue": "^2.6.10",
+    "vue-area-linkage": "^5.1.0",
     "vue-content-placeholders": "^0.2.1",
     "vue-cookie": "^1.1.4",
     "vue-cropper": "^0.1.7",
diff --git a/gpmall-front/src/components/popup.vue b/gpmall-front/src/components/popup.vue
@@ -58,7 +58,7 @@ export default {
         background: rgba(0, 0, 0, .5);
     }
     .content {
-        width: 30%;
+        width: 20%;
         background: #fff;
         border-radius: 10px;
     }
@@ -81,7 +81,7 @@ export default {
          h4 {
         text-align: center;
         font-size: 18px;
-        font-weight: 400;
+        font-weight: 700;
         color: #666;
         }
     }
diff --git a/gpmall-front/src/page/Checkout/checkout.vue b/gpmall-front/src/page/Checkout/checkout.vue
@@ -450,8 +450,8 @@
         margin-bottom: 15px;
         > input {
           width: 100%;
-          height: 50px;
-          font-size: 18px;
+          height: 38px;
+          font-size: 14px;
           padding: 10px 20px;
           border: 1px solid #ccc;
           border-radius: 6px;
@@ -464,9 +464,9 @@
     .btn {
       margin: 0;
       width: 100%;
-      height: 50px;
+      height: 43px;
       font-size: 14px;
-      line-height: 48px
+      line-height: 43px
     }
   }
 
diff --git a/gpmall-front/src/page/User/children/information.vue b/gpmall-front/src/page/User/children/information.vue
@@ -9,16 +9,25 @@
             <y-button text="上传头像" classStyle="main-btn" style="margin: 0;" @btnClick="editAvatar()"></y-button>
           </div>
         </div>
+        <div class="status-box fn-clear safe-status-warning">
+          <div  class="safe-center-title">
+            <h3 >邮箱验证</h3>
+          </div>
+          <p >绑定邮箱后，可用邮箱登录。</p>
+          <div  class="safe-todo">
+            <a >现在绑定</a>
+          </div>
+        </div>
         <div class="edit-avatar" v-if="editAvatarShow">
           <y-shelf title="设置头像">
         <span slot="right">
-                              <span class="close" @click="editAvatarShow=false">
-                        <svg t="1501234940517" class="icon" style="" viewBox="0 0 1024 1024" version="1.1"
-                             xmlns="http://www.w3.org/2000/svg" p-id="3014" xmlns:xlink="http://www.w3.org/1999/xlink"
-                             width="20" height="20"><path
-                          d="M941.576 184.248l-101.824-101.824L512 410.176 184.248 82.424 82.424 184.248 410.168 512l-327.744 327.752 101.824 101.824L512 613.824l327.752 327.752 101.824-101.824L613.832 512z"
-                          fill="#cdcdcd" p-id="3015"></path></svg>
-                    </span>
+        <span class="close" @click="editAvatarShow=false">
+          <svg t="1501234940517" class="icon" style="" viewBox="0 0 1024 1024" version="1.1"
+               xmlns="http://www.w3.org/2000/svg" p-id="3014" xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="20" height="20">
+            <path d="M941.576 184.248l-101.824-101.824L512 410.176 184.248 82.424 82.424 184.248 410.168 512l-327.744 327.752 101.824 101.824L512 613.824l327.752 327.752 101.824-101.824L613.832 512z"
+            fill="#cdcdcd" p-id="3015"></path></svg>
+        </span>
         </span>
             <div slot="content" class="content">
               <div class="edit-l">
@@ -217,6 +226,33 @@
       }
     }
   }
+  .safe-status-ok {
+    background:url("/static/images/safe-status.png") 21px 5px no-repeat;
+    background-size: 22px;
+  }
+  .safe-status-warning {
+    background:url("/static/images/safe-status-problem.png") 21px 5px no-repeat;
+    background-size: 22px;
+  }
+
+  .status-box {
+    position: relative;
+    height:6px;
+    padding-bottom: 30px;
+    margin: 0 30px 30px;
+    border-bottom: 1px solid #dadada;
+    line-height: 30px;
+  }
+
+  .safe-center-title {
+    margin-left: 60px;
+    h3 {
+      font-size: 18px;
+      font-weight: 400;
+      color: #333;
+    }
+  }
+
 
   // 修改头像
   .edit-avatar {
diff --git a/gpmall-front/src/page/User/children/order.vue b/gpmall-front/src/page/User/children/order.vue
@@ -103,7 +103,7 @@
         this._orderList()
       },
       orderPayment (orderId) {
-        window.open(window.location.origin + '#/order/payment?orderId=' + orderId)
+        window.open(window.location.origin + '#/order/payment/' + orderId)
       },
       goodsDetails (id) {
         window.open(window.location.origin + '#/product/' + id)
diff --git a/gpmall-front/static/images/safe-status-problem.png b/gpmall-front/static/images/safe-status-problem.png
diff --git a/gpmall-front/static/images/safe-status.png b/gpmall-front/static/images/safe-status.png
diff --git a/gpmall-shopping/src/main/java/com/gpmall/shopping/controller/AddressController.java b/gpmall-shopping/src/main/java/com/gpmall/shopping/controller/AddressController.java
@@ -51,13 +51,16 @@ public ResponseData addressList(HttpServletRequest request){
     }
 
     @PostMapping("/addresses")
-    public ResponseData addressAdd(@RequestBody  AddressForm form){
+    public ResponseData addressAdd(@RequestBody  AddressForm form,HttpServletRequest servletRequest){
 
         System.out.println(form.is_Default());
         System.out.println(form.toString() );
 
         AddAddressRequest request = new AddAddressRequest();
-        request.setUserId(form.getUserId());
+        String userInfo=(String)servletRequest.getAttribute(TokenIntercepter.USER_INFO_KEY);
+        JSONObject object= JSON.parseObject(userInfo);
+        Long uid=Long.parseLong(object.get("uid").toString());
+        request.setUserId(uid);
         request.setUserName(form.getUserName());
         request.setStreetName(form.getStreetName());
         request.setTel(form.getTel());
@@ -83,13 +86,16 @@ public ResponseData addressDel(@PathVariable("addressid") Long addressid){
     }
 
     @PutMapping("/addresses")
-    public ResponseData addressUpdate(@RequestBody AddressForm form){
+    public ResponseData addressUpdate(@RequestBody AddressForm form,HttpServletRequest servletRequest){
         UpdateAddressRequest request = new UpdateAddressRequest();
+        String userInfo=(String)servletRequest.getAttribute(TokenIntercepter.USER_INFO_KEY);
+        JSONObject object= JSON.parseObject(userInfo);
+        Long uid=Long.parseLong(object.get("uid").toString());
         request.setAddressId(form.getAddressId());
         request.setIsDefault(form.is_Default());
         request.setStreetName(form.getStreetName());
         request.setTel(form.getTel());
-        request.setUserId(form.getUserId());
+        request.setUserId(uid);
         request.setUserName(form.getUserName());
 
         UpdateAddressResponse response = addressService.updateAddress(request);
diff --git a/gpmall-shopping/src/main/java/com/gpmall/shopping/controller/OrderController.java b/gpmall-shopping/src/main/java/com/gpmall/shopping/controller/OrderController.java
@@ -16,6 +16,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
 
 /**
  * 腾讯课堂搜索【咕泡学院】
@@ -42,6 +43,7 @@ public ResponseData order(@RequestBody CreateOrderRequest request,HttpServletReq
         JSONObject object= JSON.parseObject(userInfo);
         Long uid=Long.parseLong(object.get("uid").toString());
         request.setUserId(uid);
+        request.setUniqueKey(UUID.randomUUID().toString());
         CreateOrderResponse response=orderCoreService.createOrder(request);
         if(response.getCode().equals(OrderRetCode.SUCCESS.getCode())){
             return new ResponseUtil<>().setData(response.getOrderId());
diff --git a/gpmall-shopping/src/main/java/com/gpmall/shopping/form/AddressForm.java b/gpmall-shopping/src/main/java/com/gpmall/shopping/form/AddressForm.java
@@ -8,7 +8,6 @@
  */
 @Data
 public class AddressForm {
-	private Long userId;
 	private Long addressId;
 	private String userName;
 	private String tel;
diff --git a/order-services/order-api/src/main/java/com/gpmall/order/dto/CreateOrderRequest.java b/order-services/order-api/src/main/java/com/gpmall/order/dto/CreateOrderRequest.java
@@ -35,6 +35,7 @@ public class CreateOrderRequest extends AbstractRequest{
 
     List<CartProductDto> cartProductDtoList;//购物车中的商品列表
 
+    private String uniqueKey; //业务唯一id
 
 
     @Override
diff --git a/order-services/order-provider/pom.xml b/order-services/order-provider/pom.xml
@@ -120,7 +120,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--<plugin>
+           <!-- <plugin>
                 <groupId>org.mybatis.generator</groupId>
                 <artifactId>mybatis-generator-maven-plugin</artifactId>
             </plugin>-->
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/biz/context/CreateOrderContext.java b/order-services/order-provider/src/main/java/com/gpmall/order/biz/context/CreateOrderContext.java
@@ -35,4 +35,6 @@ public class CreateOrderContext extends AbsTransHandlerContext{
 
     private String buyerNickName;
 
+    private String uniqueKey; //业务唯一id
+
 }
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/biz/convert/CreateOrderConvert.java b/order-services/order-provider/src/main/java/com/gpmall/order/biz/convert/CreateOrderConvert.java
@@ -29,6 +29,7 @@ public TransHandlerContext convertRequest2Ctx(AbstractRequest req, TransHandlerC
         createOrderContext.setTel(createOrderRequest.getTel());
         createOrderContext.setUserId(createOrderRequest.getUserId());
         createOrderContext.setUserName(createOrderRequest.getUserName());
+        createOrderContext.setUniqueKey(createOrderRequest.getUniqueKey());
         return createOrderContext;
     }
 
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/biz/handler/InitOrderHandler.java b/order-services/order-provider/src/main/java/com/gpmall/order/biz/handler/InitOrderHandler.java
@@ -60,15 +60,16 @@ public boolean isAsync() {
         return false;
     }
 
+    //TODO: 事务这里还没测试过， 大家看到这段代码的时候测试一下，如果有问题记得改
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Override
     public boolean handle(TransHandlerContext context) {
         log.info("begin InitOrderHandler :context:"+context);
         Order order=new Order();
         try {
-            //TODO 幂等校验（防止订单重复提交）
             CreateOrderContext createOrderContext=(CreateOrderContext)context;
             String orderId = globalIdGeneratorUtil.getNextSeq(ORDER_GLOBAL_ID_CACHE_KEY, 1);
+            order.setUniqueKey(createOrderContext.getUniqueKey());
             order.setOrderId(orderId);
             order.setUserId(Long.valueOf(createOrderContext.getUserId()));
             order.setBuyerNick(createOrderContext.getBuyerNickName());
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/entitys/Order.java b/order-services/order-provider/src/main/java/com/gpmall/order/dal/entitys/Order.java
@@ -39,6 +39,8 @@ public class Order implements Serializable {
 
     private Boolean buyerComment;
 
+    private String uniqueKey;
+
     private static final long serialVersionUID = 1L;
 
     public String getOrderId() {
@@ -177,6 +179,14 @@ public void setBuyerComment(Boolean buyerComment) {
         this.buyerComment = buyerComment;
     }
 
+    public String getUniqueKey() {
+        return uniqueKey;
+    }
+
+    public void setUniqueKey(String uniqueKey) {
+        this.uniqueKey = uniqueKey == null ? null : uniqueKey.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -200,6 +210,7 @@ public String toString() {
         sb.append(", buyerMessage=").append(buyerMessage);
         sb.append(", buyerNick=").append(buyerNick);
         sb.append(", buyerComment=").append(buyerComment);
+        sb.append(", uniqueKey=").append(uniqueKey);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/entitys/OrderExample.java b/order-services/order-provider/src/main/java/com/gpmall/order/dal/entitys/OrderExample.java
@@ -1175,6 +1175,76 @@ public Criteria andBuyerCommentNotBetween(Boolean value1, Boolean value2) {
             addCriterion("buyer_comment not between", value1, value2, "buyerComment");
             return (Criteria) this;
         }
+
+        public Criteria andUniqueKeyIsNull() {
+            addCriterion("unique_key is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyIsNotNull() {
+            addCriterion("unique_key is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyEqualTo(String value) {
+            addCriterion("unique_key =", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyNotEqualTo(String value) {
+            addCriterion("unique_key <>", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyGreaterThan(String value) {
+            addCriterion("unique_key >", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyGreaterThanOrEqualTo(String value) {
+            addCriterion("unique_key >=", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyLessThan(String value) {
+            addCriterion("unique_key <", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyLessThanOrEqualTo(String value) {
+            addCriterion("unique_key <=", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyLike(String value) {
+            addCriterion("unique_key like", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyNotLike(String value) {
+            addCriterion("unique_key not like", value, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyIn(List<String> values) {
+            addCriterion("unique_key in", values, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyNotIn(List<String> values) {
+            addCriterion("unique_key not in", values, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyBetween(String value1, String value2) {
+            addCriterion("unique_key between", value1, value2, "uniqueKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniqueKeyNotBetween(String value1, String value2) {
+            addCriterion("unique_key not between", value1, value2, "uniqueKey");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.java b/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.java
@@ -1,9 +1,9 @@
 package com.gpmall.order.dal.persistence;
 
-import com.gpmall.order.dal.entitys.Order;
-import com.gpmall.order.dal.entitys.OrderExample;
 import java.util.List;
 
+import com.gpmall.order.dal.entitys.Order;
+import com.gpmall.order.dal.entitys.OrderExample;
 import com.gpmall.order.dal.entitys.OrderList;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.xml b/order-services/order-provider/src/main/java/com/gpmall/order/dal/persistence/OrderMapper.xml
diff --git a/order-services/order-provider/src/main/java/com/gpmall/order/services/OrderCoreServiceImpl.java b/order-services/order-provider/src/main/java/com/gpmall/order/services/OrderCoreServiceImpl.java
diff --git a/order-services/order-provider/src/main/resources/mybatis-generater.xml b/order-services/order-provider/src/main/resources/mybatis-generater.xml

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export default {`
`58`	`58`	`background: rgba(0, 0, 0, .5);`
`59`	`59`	`}`
`60`	`60`	`.content {`
`61`		`- width: 30%;`
	`61`	`+ width: 20%;`
`62`	`62`	`background: #fff;`
`63`	`63`	`border-radius: 10px;`
`64`	`64`	`}`
`@@ -81,7 +81,7 @@ export default {`
`81`	`81`	`h4 {`
`82`	`82`	`text-align: center;`
`83`	`83`	`font-size: 18px;`
`84`		`- font-weight: 400;`
	`84`	`+ font-weight: 700;`
`85`	`85`	`color: #666;`
`86`	`86`	`}`
`87`	`87`	`}`