commit

src/main/java/com/example/afrishop_v3/controllers/CartController.java

@@ -149,10 +149,10 @@ public class CartController extends Controller {
 
     private TbCfCartRecordR updateItemCategory(TbCfCartRecordR tbCfItemDetail) {
 
-        Optional<TbCfStationItem> byId = itemRepository.findById(tbCfItemDetail.getItemId());
-        if (byId.isPresent() && byId.get().getExpress() != null) {
-            tbCfItemDetail.setTemplate(byId.get().getExpress());
-        } else {
+//        Optional<TbCfStationItem> byId = itemRepository.findById(tbCfItemDetail.getItemId());
+//        if (byId.isPresent() && byId.get().getExpress() != null) {
+//            tbCfItemDetail.setTemplate(byId.get().getExpress());
+//        } else {
 
 //            if( byId.isPresent() ){
 //                TbCfExpressTemplate templateIdAsc = templateRepository.findFirstByOrderByTemplateIdAsc();
@@ -160,6 +160,7 @@ public class CartController extends Controller {
 //                if (templateIdAsc != null)
 //                    tbCfItemDetail.setTemplate(templateIdAsc);
 //            } else {
+            System.out.println("No template, keep processing");
                 TbCfExpressTemplate expressTemplate = null;
                 try {
                     expressTemplate = recognizeItemCategory(tbCfItemDetail.getItemTitle());
@@ -171,7 +172,7 @@ public class CartController extends Controller {
                     tbCfItemDetail.setTemplate(expressTemplate);
                 }
             //}
-        }
+ //       }
 
 
         return tbCfItemDetail;

src/main/java/com/example/afrishop_v3/models/TbCfExpTemKeyword.java

@@ -31,6 +31,9 @@ public class TbCfExpTemKeyword{
      */
     private String keyword;
 
+
+    private String enkeyword;
+
     /**
      * 设置：
      */

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -299,10 +299,9 @@ public class TbCfOrder {
         if (expressTemplate == null) return BigDecimal.ZERO;
         //计算手续费
         //计算手续费
-        BigDecimal handlingFee = expressTemplate.getHandlingFee()
-                .multiply(itemPrice);
 
-        return handlingFee;
+        return expressTemplate.getHandlingFee()
+                .multiply(itemPrice);
 
     }
 

src/main/java/com/example/afrishop_v3/repository/TbCfExpressTemplateRepository.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.query.Param;
 import java.util.List;
 
 public interface TbCfExpressTemplateRepository extends PagingAndSortingRepository<TbCfExpressTemplate,String> {
-    @Query(value = "select distinct a from #{#entityName} a WHERE a.templateId in (SELECT x.templateId FROM TbCfExpTemKeyword x WHERE x.keyword LIKE concat('%',:keyword,'%'))")
+    @Query(value = "select distinct a from #{#entityName} a WHERE a.templateId in (SELECT x.templateId FROM TbCfExpTemKeyword x WHERE x.keyword LIKE concat('%',:keyword,'%') or x.enkeyword LIKE concat('%',:keyword,'%'))")
     List<TbCfExpressTemplate> getTemplateByKeyword(@Param("keyword") String keyword);
 
     TbCfExpressTemplate findFirstByOrderByTemplateIdAsc();