Merge branch 'release-201825-wangcz'

src/main/java/com/uas/platform/b2b/openapi/controller/UsoftFxController.java

@@ -18,7 +18,7 @@ import java.util.*;
  * @Date: Created in 9:15 2018/8/27.
  */
 @RestController
-@RequestMapping("/api/puchase")
+@RequestMapping("/openapi/api/puchase")
 public class UsoftFxController {
 
     @Autowired

src/main/java/com/uas/platform/b2b/openapi/model/FxPurcAcceptItem.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.openapi.model;
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseOrder;
 import com.uas.platform.b2b.model.PurchaseOrderItem;
+import org.springframework.util.StringUtils;
 
 import java.util.Date;
 
@@ -42,6 +43,20 @@ public class FxPurcAcceptItem {
      */
     private FxPurcOrderItem orderItem;
 
+    /**
+     * 是否对账(已对账，已收货)
+     * @return
+     */
+    private String isCheck;
+
+    public String getIsCheck() {
+        return isCheck;
+    }
+
+    public void setIsCheck(String isCheck) {
+        this.isCheck = isCheck;
+    }
+
     public FxPurcOrderItem getOrderItem() {
         return orderItem;
     }
@@ -107,6 +122,11 @@ public class FxPurcAcceptItem {
         this.acceptQty = acceptItem.getQty();
         this.acceptAmount = acceptItem.getTaxrate();
         this.detno = acceptItem.getNumber();
+        if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
+            this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
+        } else {
+            this.isCheck = "已收货";
+        }
     }
 
     public FxPurcAcceptItem convert(PurchaseAcceptItem acceptItem, PurchaseOrderItem orderItem , PurchaseOrder order) {
@@ -116,6 +136,12 @@ public class FxPurcAcceptItem {
         this.acceptQty = acceptItem.getQty();
         this.acceptAmount = acceptItem.getTaxrate();
         this.detno = acceptItem.getNumber();
+        if (!StringUtils.isEmpty(acceptItem.getCheckQty())) {
+            this.isCheck = acceptItem.getCheckQty() >= acceptItem.getQty() ? "已对账" : "已收货";
+        } else {
+            this.isCheck = "已收货";
+        }
+
         this.orderItem = new FxPurcOrderItem().convert(orderItem,order);
         return this;
     }

src/main/webapp/resources/tpl/index/common/header.html

@@ -38,7 +38,10 @@
         float: left;
         cursor: pointer;
     }
-	#header .mall-logo {
+    #header .header-main > li.header-guid .guid a.enter:hover img{
+        transform: scale(1.06) ;
+    }
+    #header .mall-logo {
 		line-height: 100px;
 	}
 	#header .header-main .mall-slogan {
@@ -227,7 +230,7 @@
                             </a>
                             <!--立即入驻-->
                             <a class="enter" ng-click="b2cLink('/vendor#/store/maintain')">
-                                <img src="static/img/all/goInto.jpg"/>
+                                <img src="static/img/all/goInto.png"/>
                             </a>
                         </div>
                     </li>
@@ -245,7 +248,7 @@
             </li>
             <li>
                 <a ng-click="b2cLink('/applyPurchase')">询价求购</a>
-                <img class="new-animate" src="static/img/all/banner-cuxiao03.png" alt="">
+                <img class="new-animate" src="static/img/all/bussiness.png" alt="">
             </li>
             <li>
                 <a ui-sref="home" class="active">B2B商务</a>