瀏覽代碼

product search string format error

huodongdong 7 年之前
父節點
當前提交
47afdb4c32

+ 2 - 2
rankin-product-service/src/main/java/cn/rankin/productservice/controller/ProductController.java

@@ -32,12 +32,12 @@ public class ProductController {
         Product product = new Product();
         String code = searchDTO.getCode();
         if (!StringUtils.isEmpty(code)) {
-            product.setCode(String.format("%" + code + "%"));
+            product.setCode("%" + code + "%");
         }
 
         String name = searchDTO.getName();
         if (!StringUtils.isEmpty(name)) {
-            product.setName(String.format("%" + name + "%"));
+            product.setName("%" + name + "%");
         }
 
         product.setType(searchDTO.getType());

+ 0 - 3
rankin-product-service/src/main/java/cn/rankin/productservice/service/TagService.java

@@ -1,13 +1,11 @@
 package cn.rankin.productservice.service;
 
-import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.common.utils.util.ListUtil;
 import cn.rankin.data.api.product.dto.TagDTO;
-import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.data.api.product.entity.MerchantProduct;
 import cn.rankin.data.api.product.entity.MerchantProductTagRelation;
 import cn.rankin.data.api.product.entity.Tag;
@@ -17,7 +15,6 @@ import cn.rankin.productservice.repository.MerchantProductRepository;
 import cn.rankin.productservice.repository.TagGroupRepository;
 import cn.rankin.productservice.repository.TagRepository;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 0
rankin-task/src/main/java/cn/rankin/task/repository/OrderDetailRepository.java

@@ -2,6 +2,7 @@ package cn.rankin.task.repository;
 
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
 import cn.rankin.data.api.trade.entity.OrderDetail;
+import org.springframework.transaction.annotation.Transactional;
 
 public interface OrderDetailRepository extends BasicJpaRepository<OrderDetail, String> {
 }

+ 1 - 0
rankin-task/src/main/java/cn/rankin/task/task/order/OrderSplitTask.java

@@ -101,6 +101,7 @@ public class OrderSplitTask {
                 orderDetail = orderDetailCpIdMap.get(cpId);
                 if (orderDetail == null) {
                     orderDetail = initOrderDetail(order);
+                    orderDetailCpIdMap.put(cpId, orderDetail);
                 }
             } else if (type.equals(ProductTypeEnum.COURSE)) {
                 // 课程,虚拟商品,放到virtualOrder中