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

fengliang
2 parents 555e2538 2f34cc74
Showing 7 changed files with 19 additions and 11 deletions
etrade-coupon/src/main/resources/com/diligrp/etrade/dao/mapper/CouponBindUserDao.xml
etrade-coupon/src/main/resources/com/diligrp/etrade/dao/mapper/CouponTemplateDao.xml
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/basicdata/CategoryRpc.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/request/CusCategoryQuery.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/StockAddRequest.java
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ShopApproveMainProductMapper.xml
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ShopMainProductMapper.xml
@@ -364,7 +364,7 @@
         order by cbu.coupon_no desc
     </select>
     <update id="updateByCustomerId" parameterType="com.diligrp.etrade.coupon.model.CouponBindUserDo">
-        UPDATE `dili_etrade`.`coupon_bind_user`
+        UPDATE `coupon_bind_user`
         SET `customer_name`             = #{customerName},
             `customer_certificate_type` = #{customerCertificateType},
             `customer_certificate_no`   = #{customerCertificateNo},
@@ -37,7 +37,7 @@
             template_no LIKE concat(#{key},'%')
     </select>
     <insert id="insert" parameterType="com.diligrp.etrade.coupon.domain.CouponTemplateDto">
-        INSERT INTO `dili_etrade`.`coupon_template` (
+        INSERT INTO `coupon_template` (
             `template_no`,
             `template_name`,
             `valid_type`,
@@ -106,7 +106,7 @@
             ct.id = #{id}
     </select>
     <update id="updateById" parameterType="com.diligrp.etrade.coupon.model.CouponTemplateDo">
-        UPDATE `dili_etrade`.`coupon_template`
+        UPDATE `coupon_template`
         SET
             `state` = #{state},
             `version` = #{version}+1,
@@ -77,9 +77,9 @@ public interface CategoryRpc {
      */
     default List<CusCategoryDTO> listCategoryChildByXtrade(Long categoryId, Long marketId) {
         CusCategoryQuery query = new CusCategoryQuery();
-        query.setParent(categoryId);
+        query.setCategoryId(categoryId);
         query.setMarketId(marketId);
-        List<CusCategoryDTO> list = this.listCusCategory(query).getData();
+        List<CusCategoryDTO> list = this.listCategoryChildByXtrade(query).getData();
         return list;
     }
 }
@@ -42,6 +42,8 @@ public class CusCategoryQuery {
     private Long marketId;
+    private Long categoryId;
+
     private Long parent;
     private Integer state;
@@ -140,5 +142,11 @@ public class CusCategoryQuery {
         this.marketId = marketId;
     }
+    public Long getCategoryId() {
+        return categoryId;
+    }
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
 }
 \ No newline at end of file
@@ -30,7 +30,7 @@ public record StockAddRequest(String businessCode, BigDecimal stock, Long produc
         boolean isBusinessCodeNotBlank = StrUtil.isNotBlank(businessCode);
-        boolean isJmsfStockNullOrNegative = (jmsfStock == null || jmsfStock.compareTo(BigDecimal.ZERO) < 0);
+        boolean isJmsfStockNullOrNegative = (jmsfStock == null || jmsfStock.compareTo(BigDecimal.ZERO) <= 0);
         if (sourceType == StockSourceType.ADMIN.getCode() || sourceType == StockSourceType.MCH.getCode()) {
             if (isBusinessCodeNotBlank && isJmsfStockNullOrNegative) {
@@ -41,7 +41,7 @@ public record StockAddRequest(String businessCode, BigDecimal stock, Long produc
                 throw new IllegalArgumentException("business_code cannot be null or empty");
             }
         }
-        if (stock == null || stock.compareTo(BigDecimal.ZERO) < 0) {
+        if (stock == null || stock.compareTo(BigDecimal.ZERO) <= 0) {
             throw new IllegalArgumentException("stock cannot be null or negative");
         }
         if (productId == null) {
@@ -65,11 +65,11 @@
     </insert>
     <delete id="deleteByApproveId">
-        DELETE FROM `dili_etrade`.`shop_approve_main_product` WHERE `approve_id` = #{approveId}
+        DELETE FROM `shop_approve_main_product` WHERE `approve_id` = #{approveId}
     </delete>
     <select id="selectShopApproveMainProducts" resultType="com.diligrp.etrade.shop.model.ShopApproveMainProduct">
-        SELECT id,shop_id,approve_id,market_id,category_id,category_name,level, top_category_id, top_category_name FROM `dili_etrade`.`shop_approve_main_product`
+        SELECT id,shop_id,approve_id,market_id,category_id,category_name,level, top_category_id, top_category_name FROM `shop_approve_main_product`
         WHERE `shop_id` = #{shopId}
         <if test="approveId != null">
@@ -4,13 +4,13 @@
     <select id="selectShopMainProducts" resultType="com.diligrp.etrade.shop.domain.response.ShopMainProductVo">
-        SELECT id,shop_id,market_id,category_id,category_name,level, top_category_id, top_category_name FROM `dili_etrade`.`shop_main_product`
+        SELECT id,shop_id,market_id,category_id,category_name,level, top_category_id, top_category_name FROM `shop_main_product`
         WHERE `shop_id` = #{shopId}
     </select>
     <delete id="deleteByShopId">
-        DELETE FROM `dili_etrade`.`shop_main_product` WHERE `shop_id` = #{shopId}
+        DELETE FROM `shop_main_product` WHERE `shop_id` = #{shopId}
     </delete>