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

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/ProductInfoController.java

@@ -147,4 +147,11 @@ public class ProductInfoController extends CarbonBaseController {
         List<ProductInfo> productInfos = this.productInfoService.searchByGoodsInfoGuid(goodsInfoGuid);
         return responseResultSuccess(productInfos);
     }
+
+    @ApiOperation("获取产品详细信息")
+    @GetMapping("/findByProductInfoGuid")
+    public ResponseBase findByProductInfoGuid(@RequestParam("productGuid") String productGuid) {
+        ProductInfo productInfos = this.productInfoService.findById(productGuid);
+        return responseResultSuccess(productInfos);
+    }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/ProductInfoMapper.java

@@ -23,4 +23,12 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo, String> {
     int softRemoveByProductTypeGuid(@Param("productTypeGuid") String productTypeGuid);
 
     List<String> selectProductGuidsByFarmerGuids(List<String> farmerInfoGuids);
+
+    /**
+     * 查询产品详情
+     * lym
+     * @param guid
+     * @return
+     */
+    ProductInfo findById(@Param("guid") String guid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/ProductInfoService.java

@@ -25,4 +25,12 @@ public interface ProductInfoService extends BaseServie<ProductInfo, String> {
     int publishGoods(GoodsInfo goodsInfo, GoodsSaleInfo goodsSaleInfo, List<ProductInfo> productInfos);
 
     List<ProductInfo> searchByGoodsInfoGuid(String goodsInfoGuid);
+
+    /**
+     * 查询产品详情
+     * lym
+     * @param guid
+     * @return
+     */
+    ProductInfo findById(String guid);
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/GoodsInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.hcloud.microserver.system.facade.carbon.entity.ProductInfo;
 import com.hcloud.microserver.system.facade.carbon.forms.FarmerInfoForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsDetailForm;
 import com.hcloud.microserver.system.facade.carbon.forms.GoodsInfoForm;
+import com.hcloud.microserver.system.util.CurrUserUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -351,6 +352,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
 
         goodsInfo.setState(1);
         goodsInfo.setModifiedTime(new Date());
+        goodsInfo.setModifiedUser(CurrUserUtil.getUserId());
 
         result = this.goodsSaleInfoMapper.deleteByGoodsInfoGuid(guidInfoGuid);
         if (result < 0) throw new RuntimeException("删除商品销售信息失败");

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/ProductInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.hcloud.microserver.commoncore.util.GeneratorIdUtils;
 import com.hcloud.microserver.commoncore.util.UUIDUtils;
 import com.hcloud.microserver.system.facade.carbon.entity.*;
 import com.hcloud.microserver.system.facade.carbon.forms.*;
+import com.hcloud.microserver.system.util.CurrUserUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -465,6 +466,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
             goodsInfo.setGoodsType(productInfos.get(0).getProductType().getTypeVal());
             goodsInfo.setGoodsCode(getMaxGoodsCode());
             goodsInfo.setIsSale(0);
+            goodsInfo.setCreateUser(CurrUserUtil.getUserId());
 
             // 合计碳汇量
             BigDecimal totalCarbonSink = new BigDecimal(0);
@@ -565,4 +567,8 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         return maxCode;
     }
 
+    @Override
+    public ProductInfo findById(String guid) {
+        return productInfoMapper.findById(guid);
+    }
 }

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/config/Swagger2Config.java

@@ -31,7 +31,7 @@ public class Swagger2Config {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.hcloud.microserver.bank.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.hcloud.microserver.system.bank.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .securitySchemes(securitySchemes())

carbon-back/carbon-back-service/src/main/resources/carbon/ProductInfoMapper.xml

@@ -349,7 +349,7 @@
     </select>
 
     <!-- 查询产品详情 lym -->
-    <!--<select id="findById" parameterType="String" resultMap="BaseResultMap">
+    <select id="findById" parameterType="String" resultMap="BaseResultMap">
         select
             product.guid,
             product.fk_product_type,
@@ -372,5 +372,5 @@
             from t_product_info product
             WHERE product.state = 1
             AND product.guid = #{guid}
-    </select>-->
+    </select>
 </mapper>