submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecTemplateServiceImpl.java

@@ -96,17 +96,11 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
                             SpecAttrPriceVo priceVo = BeanUtil.toBean(goods,SpecAttrPriceVo.class);
                             priceVo.setSpecAttrIds(x.getSpecAttributeIds());
                             priceVo.setSpecialGoods(0);
+                            priceVo.setSpecialGoods(0);
                             //商品业务类型
-//                            CourseEducationType type = courseEducationTypeService.getById(goods.getEducationTypeId());
-                            CourseBusiness business = courseBusinessService.getById(goods.getBusinessId());
-//                            if (ObjectUtils.isNotNull(type) && ObjectUtils.isNotNull(business)){
-//                                String name = type.getEducationName() + business.getAliasName();
-//                                if ("继续教育二级建造师".equals(name) || "继续教育二级造价师".equals(name)){
-//                                    priceVo.setSpecialGoods(1);
-//                                }
-//                            }
-                            if (ObjectUtils.isNotNull(business) && ObjectUtils.isNotNull(business.getTemplateStatus())){
-                                priceVo.setSpecialGoods(business.getTemplateStatus() == 1? 1:0);
+                            String businessName = goodsService.getGoodsBusinessName(x.getGoodsId());
+                            if (businessName.contains("继续教育二级建造师")){
+                                priceVo.setSpecialGoods(1);
                             }
                             return priceVo;
                         }).collect(Collectors.toList());

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{applyStartTime} >= oi.apply_time
         </if>
         <if test="searchKey != null and searchKey != ''">
-            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or u.invoice_code like concat('%', #{searchKey}, '%') or u.invoice_num like concat('%', #{searchKey}, '%'))
+            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or oi.invoice_code like concat('%', #{searchKey}, '%') or u.invoice_num like concat('%', #{searchKey}, '%'))
         </if>
         ORDER BY oi.invoice_id DESC
     </select>