Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/external/erp/product/service/impl/KindServiceImpl.java

@@ -17,10 +17,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Transactional
 public class KindServiceImpl implements KindService {
@@ -69,6 +66,7 @@ public class KindServiceImpl implements KindService {
         return null;
     }
 
+
     public List<Kind> getParentsByChildId(Long childId) {
         List<Kind> kinds = new ArrayList<Kind>();
         kinds = getParentsByChildId(childId, kinds);
@@ -110,4 +108,38 @@ public class KindServiceImpl implements KindService {
         }
         return kindPropertyUas;
     }
+
+    @Override
+    public Map<String, List<KindUas>> getParentsByKindCode(String kindCode) {
+        Map<Long, Kind> maps = new HashMap<>();
+        // 第一步是模糊查询所有的叶子节点
+        Map<String, List<KindUas>> kindMaps = new HashMap<>();
+        List<Kind> kinds = kindDao.findByKindCode(kindCode);
+        for (Kind kind : kinds) {
+            List<Kind> list = getParentsByChildId(kind.getId());
+            List<KindUas> kindUass = new ArrayList<>();
+            for (Kind k : list) {
+                kindUass.add(ModelConverter.convertUas(k));
+            }
+            if (kindMaps.size() > 0 && kindMaps.containsKey(list.get(0).getId())) {
+                Map<Long, KindUas> map = new HashMap<>();
+                for (KindUas k : kindUass) {
+                    map.put(k.getId(), k);
+                }
+                List<KindUas> oldList = kindMaps.get(list.get(0).getId());
+                for (KindUas k : oldList) {
+                    map.put(k.getId(), k);
+                }
+                List<KindUas> newList = new ArrayList<>();
+                for (KindUas k : map.values()) {
+                    newList.add(k);
+                }
+                kindMaps.put(list.get(0).getId().toString(), newList);
+            } else {
+                kindMaps.put(list.get(0).getId().toString(), kindUass);
+            }
+        }
+        return kindMaps;
+    }
+
 }

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductReplaceDao.java

@@ -3,9 +3,11 @@ package com.uas.platform.b2c.prod.commodity.dao;
 import com.uas.platform.b2c.prod.commodity.model.ProductReplace;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 public interface ProductReplaceDao extends JpaRepository<ProductReplace, Long>, JpaSpecificationExecutor<ProductReplace> {
@@ -15,5 +17,7 @@ public interface ProductReplaceDao extends JpaRepository<ProductReplace, Long>,
 
     List<ProductReplace> findByProductIdOrderByDetno(Long productId);
 
+    @Transactional
+    @Modifying
     void deleteByProductId(Long productId);
 }

src/main/java/com/uas/platform/b2c/prod/product/component/dao/ComponentDao.java

@@ -46,8 +46,9 @@ public interface ComponentDao extends JpaSpecificationExecutor<Component>, JpaRe
 	 * @param code 原厂型号
 	 * @return 器件信息
 	 */
+	@Query("select c from Component c where c.code like %:code%")
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<Component> findByCode(String code);
+	public List<Component> findByCode(@Param("code") String code);
 
 	/**
 	 * 根据原厂型号code和品牌id（brandId）查找器件

src/main/java/com/uas/platform/b2c/prod/product/component/dao/ComponentInfoDao.java

@@ -73,7 +73,8 @@ public interface ComponentInfoDao extends JpaSpecificationExecutor<ComponentInfo
 	 * @param code 原厂型号
 	 * @return 器件简易信息
 	 */
-	public List<ComponentInfo> findByKindidAndCode(Long kindid, String code);
+	@Query("select c from ComponentInfo c where c.kindid = :kindid and c.code like %:code%")
+	public List<ComponentInfo> findByKindidAndCode(@Param("kindid") Long kindid, @Param("code") String code);
 
 	/**
 	 * 获取一页有图片的器件

src/main/java/com/uas/platform/b2c/prod/product/kind/dao/KindDao.java

@@ -1,9 +1,6 @@
 package com.uas.platform.b2c.prod.product.kind.dao;
 
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
+import com.uas.platform.b2c.prod.product.kind.model.Kind;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -11,7 +8,8 @@ import org.springframework.data.jpa.repository.QueryHints;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2c.prod.product.kind.model.Kind;
+import javax.persistence.QueryHint;
+import java.util.List;
 
 @Repository
 public interface KindDao extends JpaSpecificationExecutor<Kind>, JpaRepository<Kind, Long> {
@@ -56,10 +54,18 @@ public interface KindDao extends JpaSpecificationExecutor<Kind>, JpaRepository<K
 	public List<Kind> findByNameCn(String nameCn);
 
 	/**
-	* 根据批次号获取类目信息
-	* @param batchIds id批次号
-	* @return
-	*/
+	 * 根据批次号获取类目信息
+	 * @param batchIds id批次号
+	 * @return
+	 */
 	@Query(nativeQuery = true, value = "select * from product$kind where ki_id in :batchIds")
 	public List<Kind> findByBatchIds(@Param("batchIds") List<Long> batchIds);
+
+	/**
+	 * 根据类目名模糊查询对应所有的当前类目和父级类目（兄弟类目不用）
+	 * @param nameCn 类目中文名
+	 * @return
+	 */
+	@Query("select k from Kind k where k.nameCn like %:nameCn% and k.isLeaf = 1")
+	public List<Kind> findByKindCode(@Param("nameCn") String nameCn);
 }

src/main/resources/dev/account.properties

@@ -1,7 +1,7 @@
 ### account center config, 
-account.us.save.url=http://192.168.253.12:32323/api/userspace
-account.user.save.url=http://192.168.253.12:32323/api/user
-account.user.getPartners.url=http://192.168.253.12:32323/api/partners
+account.us.save.url=http://192.168.253.6:32323/api/userspace
+account.user.save.url=http://192.168.253.6:32323/api/user
+account.user.getPartners.url=http://192.168.253.6:32323/api/partners
 ### ÍôÃ÷»ª±¾µØ:
 ### sso config
 sso.app=mall
@@ -9,17 +9,17 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://192.168.253.12:32323
-sso.logout.url=http://192.168.253.12:32323/logquit
-sso.register.url=http://192.168.253.12:32323/register/personalRegistration?appId=mall
-sso.updatePassword.url=http://192.168.253.12:32323/reset/changePasswordChooseStyle
-sso.updateMobile.url=http://192.168.253.12:32323/validation/phoneValidation
-sso.updateEmail.url=http://192.168.253.12:32323/validation/emailValidation
-sso.updateQuestion.url=http://192.168.253.12:32323/encrypted-setting/EncryptedSetting
-sso.realNameAuth.url=http://192.168.253.12:32323/certification/realNameCertification
+sso.login.url=http://192.168.253.6:32323
+sso.logout.url=http://192.168.253.6:32323/logquit
+sso.register.url=http://192.168.253.6:32323/register/personalRegistration?appId=mall
+sso.updatePassword.url=http://192.168.253.6:32323/reset/changePasswordChooseStyle
+sso.updateMobile.url=http://192.168.253.6:32323/validation/phoneValidation
+sso.updateEmail.url=http://192.168.253.6:32323/validation/emailValidation
+sso.updateQuestion.url=http://192.168.253.6:32323/encrypted-setting/EncryptedSetting
+sso.realNameAuth.url=http://192.168.253.6:32323/certification/realNameCertification
 #cross domain
-sso.ask.url=http://192.168.253.12:32323/sso/login/ask
-sso.askout.url=http://192.168.253.12:32323/sso/logout/ask
+sso.ask.url=http://192.168.253.6:32323/sso/login/ask
+sso.askout.url=http://192.168.253.6:32323/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/test/account.properties

@@ -1,24 +1,24 @@
 ### account center config, 
-account.us.save.url=http://192.168.253.12:32323/api/userspace
-account.user.save.url=http://192.168.253.12:32323/api/user
-account.user.getPartners.url=http://192.168.253.12:32323/api/partners
+account.us.save.url=http://192.168.253.6:32323/api/userspace
+account.user.save.url=http://192.168.253.6:32323/api/user
+account.user.getPartners.url=http://192.168.253.6:32323/api/partners
 ### sso config
 sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://192.168.253.12:32323
-sso.logout.url=http://192.168.253.12:32323/logquit
-sso.register.url=http://192.168.253.12:32323/register/personalRegistration?appId=mall
-sso.updatePassword.url=http://192.168.253.12:32323/reset/changePasswordChooseStyle
-sso.updateMobile.url=http://192.168.253.12:32323/validation/phoneValidation
-sso.updateEmail.url=http://192.168.253.12:32323/validation/emailValidation
-sso.updateQuestion.url=http://192.168.253.12:32323/encrypted-setting/EncryptedSetting
-sso.realNameAuth.url=http://192.168.253.12:32323/certification/realNameCertification
+sso.login.url=http://192.168.253.6:32323
+sso.logout.url=http://192.168.253.6:32323/logquit
+sso.register.url=http://192.168.253.6:32323/register/personalRegistration?appId=mall
+sso.updatePassword.url=http://192.168.253.6:32323/reset/changePasswordChooseStyle
+sso.updateMobile.url=http://192.168.253.6:32323/validation/phoneValidation
+sso.updateEmail.url=http://192.168.253.6:32323/validation/emailValidation
+sso.updateQuestion.url=http://192.168.253.6:32323/encrypted-setting/EncryptedSetting
+sso.realNameAuth.url=http://192.168.253.6:32323/certification/realNameCertification
 #cross domain
-sso.ask.url=http://192.168.253.12:32323/sso/login/ask
-sso.askout.url=http://192.168.253.12:32323/sso/logout/ask
+sso.ask.url=http://192.168.253.6:32323/sso/login/ask
+sso.askout.url=http://192.168.253.6:32323/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=