From a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 13 五月 2021 13:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |    2 ++
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java                                  |    6 ++++++
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java                  |    7 +++++--
 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java                                   |    1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
index 9ff01b0..3e790a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -49,6 +49,12 @@
     @ApiModelProperty("商品详情")
     private String details;
 
+    /**
+     * 配送方式（1.商家配送  2.快递物流）
+     */
+    @ApiModelProperty(value = "配送方式（1.商家配送  2.快递物流）",hidden = true)
+    private Integer deliveryType;
+
     @ApiModelProperty("商品规格")
     @Valid
     private List<AddShopGoodsAttrVO> goodsAttrVOList;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 63d9f86..65c355f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -126,6 +126,9 @@
             "cmp.relation, \n" +
             "cmp.marriage, \n" +
             "cmp.culture_level, \n" +
+            "cmp.out_or_local, \n" +
+            "cmp.census_register, \n" +
+            "cmp.healthy, \n" +
             "cmp.is_rent \n" +
             "FROM \n" +
             "com_mng_population AS cmp " +
@@ -149,10 +152,10 @@
             "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageStart != null'>" +
+            "<if test='comMngPopulationVO.ageStart != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageEnd != null'>" +
+            "<if test='comMngPopulationVO.ageEnd != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 25c247a..00c5bc0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -44,6 +44,7 @@
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -459,6 +460,7 @@
         if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
             populationDO.setVillageName(comMngVillageDO.getGroupAt());
         }
+        populationDO.setUpdateAt(new Date());
 //        this.updateById(populationDO);
         if(populationDAO.updateById(populationDO) > 0){
             return R.ok();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
index db55762..4d70b7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
@@ -93,6 +93,7 @@
             }
             addShopGoodsVO.setStoreId(shopStoreVO.getId());
             //addShopGoodsVO.setName(shopStoreVO.getName());
+            addShopGoodsVO.setDeliveryType(shopStoreVO.getDeliveryType());
             return communityService.saveShopGoods(addShopGoodsVO);
         }else{
             return R.fail();

--
Gitblit v1.7.1