Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -220,7 +220,7 @@ public class ProdServiceImpl implements ProdService {
 //        SimpleExpression erpDown = PredicateUtils.isNull("erpDown");
 //        LogicalExpression expression = new LogicalExpression(new SimpleExpression[]{b2cEnabled, pbranden, pcmpcode, erpDown}, CriterionExpression.Operator.AND);
 //        info.expression(expression);
-        String sql = "select pr_pbrand,pr_pcmpcode,pr_spec,pr_kind,pr_cmpuuid,pr_unit,pr_id from v$product$private where pr_erpdown is null and pr_b2cenabled = 1 and pr_pcmpcode is not null and pr_pbrand is not null limit " + i +", 500";
+        String sql = "select pr_pbranden,pr_pcmpcode,pr_spec,pr_kind,pr_cmpuuid,pr_unit,pr_id from v$product$private where pr_erpdown is null and pr_b2cenabled = 1 and pr_pcmpcode is not null and pr_pbrand is not null limit " + i +", 500";
 
         List<Map<String, Object>> mapList = commonDao.queryForList(sql);
         List<Prod> content1 =  new ArrayList<>();

src/main/java/com/uas/platform/b2c/external/erp/prod/util/ModelConvertUtil.java

@@ -24,14 +24,14 @@ public class ModelConvertUtil {
        }
        Prod prod = new Prod();
        prod.setPr_orispeccode(String.valueOf(map.get("pr_pcmpcode")));
-       prod.setPr_brand(String.valueOf(map.get("pr_pbrand")));
+       prod.setPr_brand(String.valueOf(map.get("pr_pbranden")));
        prod.setPcmpcode(String.valueOf(map.get("pr_pcmpcode")));
        prod.setKind(String.valueOf(map.get("pr_kind")));
        prod.setKinden(String.valueOf(map.get("pr_kind")));
        prod.setPr_detail(String.valueOf(map.get("pr_kind")));
        prod.setPr_uuid(String.valueOf(map.get("pr_uuid")));
-       prod.setPbrand(String.valueOf(map.get("pr_pbrand")));
-       prod.setPbranden(String.valueOf(map.get("pr_pbrand")));
+       prod.setPbrand(String.valueOf(map.get("pr_pbranden")));
+       prod.setPbranden(String.valueOf(map.get("pr_pbranden")));
        prod.setPr_code(UUID.randomUUID().toString());
        prod.setPr_spec(String.valueOf(map.get("pr_spec")));
        prod.setPr_unit(String.valueOf(map.get("pr_uuid")));
@@ -53,9 +53,9 @@ public class ModelConvertUtil {
         prod.setPr_orispeccode(String.valueOf(map.get("cmp_code")));
         prod.setPr_brand(String.valueOf(map.get("br_name_en")));
         prod.setPcmpcode(String.valueOf(map.get("cmp_code")));
-        prod.setKind(null);
-        prod.setKinden(null);
-        prod.setPr_detail(null);
+        prod.setKind(String.valueOf(map.get("ki_name")));
+        prod.setKinden(String.valueOf(map.get("ki_name")));
+        prod.setPr_detail(String.valueOf(map.get("ki_name")));
         prod.setPr_uuid(String.valueOf(map.get("cmp_uuid")));
         prod.setPbrand(String.valueOf(map.get("br_name_en")));
         prod.setPbranden(String.valueOf(map.get("br_name_en")));

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

@@ -198,7 +198,7 @@ public class ComponentServiceImpl implements ComponentService {
 //            }
 //        }, info);
 
-        String sql = "select cmp_code,br_name_en,cmp_uuid,cmp_description,cmp_unit from product$component left join `product$brand` on cmp_brid = br_id where pr_erpdown is null limit " + i + ", 500;";
+        String sql = "select cmp_code,br_name_en,cmp_uuid,cmp_description,cmp_unit,ki_name from product$component left join `product$brand` on cmp_brid = br_id left join product$kind on ki_id = cmp_kiid where pr_erpdown is null limit " + i + ", 500";
 
         List<Map<String, Object>> mapList = commonDao.queryForList(sql);
         List<Prod> content1 =  new ArrayList<>();