Browse Source

优化。

lym 4 years ago
parent
commit
1f089a667c
31 changed files with 42 additions and 15 deletions
  1. 7 0
      carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/ProductInfoController.java
  2. 8 0
      carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/ProductInfoMapper.java
  3. 8 0
      carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/ProductInfoService.java
  4. 4 0
      carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/ProductInfoServiceImpl.java
  5. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/BaseDictionaryMapper.xml
  6. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/BaseDictionaryTypeMapper.xml
  7. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/BasePositionMapper.xml
  8. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/CarbonCalculateRuleMapper.xml
  9. 2 2
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CarbonStatisticsMapper.xml
  10. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/CollectiveFarmerMapper.xml
  11. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerChannelMapper.xml
  12. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerCompanyInfoMapper.xml
  13. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/CustomerCompanyTypeMapper.xml
  14. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerInfoMapper.xml
  15. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/FarmerInfoMapper.xml
  16. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsCredentialInfoMapper.xml
  17. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsDetailMapper.xml
  18. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsInfoMapper.xml
  19. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsOrderDetailMapper.xml
  20. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsOrderInfoMapper.xml
  21. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsPayOrderMapper.xml
  22. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsSaleInfoMapper.xml
  23. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/OrderPayApplyMapper.xml
  24. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/OrderPayVoucherMapper.xml
  25. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/PovertyAreaMapper.xml
  26. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/ProductBelongMapper.xml
  27. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/ProductExpansionMapper.xml
  28. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/ProductInfoMapper.xml
  29. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeExpansionMapper.xml
  30. 0 0
      carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeMapper.xml
  31. 1 1
      carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/WebIndexService.xml

+ 7 - 0
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("获取产品详细信息")
+    @PostMapping("/findByProductInfoGuid")
+    public ResponseBase findByProductInfoGuid(@RequestParam("productGuid") String productGuid) {
+        ProductInfo productInfos = this.productInfoService.findById(productGuid);
+        return responseResultSuccess(productInfos);
+    }
 }

+ 8 - 0
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);
 }

+ 8 - 0
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);
 }

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

@@ -565,4 +565,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/resources/com/hcloud/microserver/system/bank/dao/BaseDictionaryMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/BaseDictionaryMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/BaseDictionaryTypeMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/BaseDictionaryTypeMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/BasePositionMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/BasePositionMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CarbonCalculateRuleMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/CarbonCalculateRuleMapper.xml


+ 2 - 2
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CarbonStatisticsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.CarbonStatisticsMapper">
-    <select id="CarbonPlatformTotalStatitics"
+<mapper namespace="CarbonStatisticsMapper">
+    <select id="carbonPlatformTotalStatitics"
             resultType="CarbonPlatformStatiticsNum">
 
         SELECT

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CollectiveFarmerMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/CollectiveFarmerMapper.xml


+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerChannelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerChannelMapper">
+<mapper namespace="CustomerChannelMapper">
   <resultMap id="BaseResultMap" type="CustomerChannel">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerCompanyInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerCompanyInfoMapper">
+<mapper namespace="CustomerCompanyInfoMapper">
     <resultMap id="BaseResultMap" type="CustomerCompanyInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId"/>

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerCompanyTypeMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/CustomerCompanyTypeMapper.xml


+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/CustomerInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.CustomerInfoMapper">
+<mapper namespace="CustomerInfoMapper">
   <resultMap id="BaseResultMap" type="CustomerInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="account" jdbcType="VARCHAR" property="account" />

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/FarmerInfoMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/FarmerInfoMapper.xml


+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsCredentialInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsCredentialInfoMapper">
+<mapper namespace="GoodsCredentialInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsCredentialInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsDetailMapper">
+<mapper namespace="GoodsDetailMapper">
     <resultMap id="BaseResultMap" type="GoodsDetail">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid"/>

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsInfoMapper">
+<mapper namespace="GoodsInfoMapper">
     <resultMap id="BaseResultMap" type="GoodsInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="goods_type" jdbcType="VARCHAR" property="goodsType"/>

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsOrderDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderDetailMapper">
+<mapper namespace="GoodsOrderDetailMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderDetail">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_order_guid" jdbcType="CHAR" property="fkOrderGuid" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsOrderInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsOrderInfoMapper">
+<mapper namespace="GoodsOrderInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsOrderInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_guid" jdbcType="CHAR" property="fkCustomerGuid" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsPayOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsPayOrderMapper">
+<mapper namespace="GoodsPayOrderMapper">
   <resultMap id="BaseResultMap" type="GoodsPayOrder">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/GoodsSaleInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsSaleInfoMapper">
+<mapper namespace="GoodsSaleInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsSaleInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid" />

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/OrderPayApplyMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.OrderPayApplyMapper">
+<mapper namespace="OrderPayApplyMapper">
     <resultMap id="BaseResultMap" type="OrderPayApply">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId"/>

+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/OrderPayVoucherMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.OrderPayVoucherMapper">
+<mapper namespace="OrderPayVoucherMapper">
     <resultMap id="BaseResultMap" type="OrderPayVoucher">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_order_id" jdbcType="CHAR" property="fkOrderId"/>

carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/PovertyAreaMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/PovertyAreaMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductBelongMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/ProductBelongMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductExpansionMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/ProductExpansionMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductInfoMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/ProductInfoMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductTypeExpansionMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeExpansionMapper.xml


carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/ProductTypeMapper.xml → carbon-back/carbon-back-service/src/main/resources/carbon/ProductTypeMapper.xml


+ 1 - 1
carbon-back/carbon-back-service/src/main/resources/com/hcloud/microserver/system/bank/dao/WebIndexService.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.system.bank.dao.WebIndexMapper">
+<mapper namespace="WebIndexMapper">
 
     <select id="dayCarbon" resultType="DayCarbonBO">
         SELECT