MERGE

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/ProfileTpController.java

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.base.service.IProfileTpService;
 import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
 import com.zhongzheng.modules.base.vo.UserProfileVo;
+import com.zhongzheng.modules.user.bo.CommitmentSealBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +21,7 @@ import net.polyv.common.v1.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
 import java.util.List;
@@ -63,8 +65,16 @@ public class ProfileTpController extends BaseController {
         return getDataTable(list);
     }
 
-
-
+    /**
+     * 学员上传承诺书
+     */
+    @ApiOperation("学员上传承诺书")
+    @PostMapping("/commitment/upload")
+    public AjaxResult<Void> commitmentSealUpload(CommitmentSealBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iProfileTpService.commitmentSealUpload(bo) ? 1:0 );
+    }
 
 
     /**

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysDictData.java

@@ -71,7 +71,7 @@ public class SysDictData implements Serializable
     private String listClass;
 
     @TableField(value = "tenant_id")
-    private Long tenantId;
+    private String tenantId;
 
     /** 是否默认（Y是 N否） */
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -402,7 +402,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
             }
             dictData.setDictCode(null);
             dictData.setDictTypeId(dictType1.getDictId());
-            dictData.setTenantId(newTenantId);
+            dictData.setTenantId(newTenantId.toString());
         }
         iSysDictDataService.saveBatch(dictDatas);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IProfileTpService.java

@@ -6,6 +6,8 @@ import com.zhongzheng.modules.base.bo.ProfileTpEditBo;
 import com.zhongzheng.modules.base.bo.ProfileTpQueryBo;
 import com.zhongzheng.modules.base.domain.ProfileTp;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
+import com.zhongzheng.modules.user.bo.CommitmentSealBo;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Collection;
 import java.util.List;
@@ -56,4 +58,6 @@ public interface IProfileTpService extends IService<ProfileTp> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	ProfileTpVo queryByGoodsId(Long goodsId);
+
+    boolean commitmentSealUpload(CommitmentSealBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -4,10 +4,13 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.base.bo.ProfileTpAddBo;
@@ -15,14 +18,18 @@ import com.zhongzheng.modules.base.bo.ProfileTpEditBo;
 import com.zhongzheng.modules.base.bo.ProfileTpQueryBo;
 import com.zhongzheng.modules.base.domain.ProfileTp;
 import com.zhongzheng.modules.base.domain.ProfileTpBusiness;
+import com.zhongzheng.modules.base.domain.UserProfile;
 import com.zhongzheng.modules.base.mapper.ProfileTpMapper;
 import com.zhongzheng.modules.base.service.IProfileTpBusinessService;
 import com.zhongzheng.modules.base.service.IProfileTpService;
+import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
+import com.zhongzheng.modules.user.bo.CommitmentSealBo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -39,6 +46,9 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
     @Autowired
     private IProfileTpBusinessService iProfileTpBusinessService;
 
+    @Autowired
+    private IUserProfileService iUserProfileService;
+
 
     @Override
     public ProfileTpVo queryById(Long profileTpId){
@@ -166,5 +176,43 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
         }
     }
 
+    @Override
+    public boolean commitmentSealUpload(CommitmentSealBo bo) {
+        //todo 承诺书校验
+
+        UserProfile userProfile = iUserProfileService.getById(bo.getId());
+        if (ObjectUtils.isNull(userProfile)){
+            throw new CustomException("学员资料不存在");
+        }
+        if (!userProfile.getUserId().equals(bo.getUserId())){
+            throw new CustomException("当前学员和资料不匹配");
+        }
+        //替换学员承诺书
+        String keyValue = userProfile.getKeyValue();
+        JSONObject jsonObject = JSONObject.parseObject(keyValue);
+        Map<String, Object> userMap = new HashMap<>();
+        for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
+            userMap.put(entry.getKey(), entry.getValue());
+        }
+        String key = "commitment_seal";
+        JSONObject recentJson = JSONObject.parseObject(userMap.get(key).toString());
+        Map<String, Object> recentMap = new HashMap<>();
+        for (Map.Entry<String, Object> entry : recentJson.entrySet()) {
+            recentMap.put(entry.getKey(), entry.getValue());
+        }
+        if (ObjectUtils.isNotNull(recentMap)){
+            recentMap.put("value",bo.getImageUrl());
+        }else {
+            recentMap.put("fieldKey",key);
+            recentMap.put("value",bo.getImageUrl());
+            recentMap.put("fieldName","承诺书盖章");
+            recentMap.put("status",0);
+        }
+        userMap.put(key,recentMap);
+        String content = JSONObject.toJSONString(userMap);
+        userProfile.setKeyValue(content);
+        return iUserProfileService.updateById(userProfile);
+    }
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseHandoutsMapper.java

@@ -42,4 +42,7 @@ public interface CourseHandoutsMapper extends BaseMapper<CourseHandouts> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<CourseHandouts> getHandoutsListByTenant(@Param("encoder") String encoder,@Param("handoutsName") String handoutsName,@Param("tenantId") Long tenantId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void removeHandoutsRecord(@Param("handoutsId")Long handoutsId,@Param("tenantId") Long tenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -84,7 +85,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
             });
             courseHandoutsVo.setFileList(courseFileVos);
         } else {
-            List<CourseFileVo> fileVos = courseFileVos.stream().filter(item -> item.getParentId() == 0L).collect(Collectors.toList());
+            List<CourseFileVo> fileVos = courseFileVos.stream().filter(item -> ObjectUtils.isNotNull(item.getParentId()) && item.getParentId() == 0L).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(fileVos)) {
                 fileVos.forEach(file -> {
                     assembleFile(file, courseFileVos,true);
@@ -335,6 +336,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
         baseMapper.removeHandouts(handoutsId, tenantId);
         baseMapper.removeHandoutsBusiness(handoutsId, tenantId);
         baseMapper.removeHandoutsFile(handoutsId, tenantId);
+        baseMapper.removeHandoutsRecord(handoutsId, tenantId);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -14,6 +14,8 @@ import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.base.domain.UserProfile;
+import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.course.bo.CourseAddBo;
 import com.zhongzheng.modules.course.bo.CourseEditBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
@@ -37,6 +39,7 @@ import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.bo.UserPeriodQueryBo;
 import com.zhongzheng.modules.grade.bo.UserPeriodStatusAddBo;
+import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
@@ -62,10 +65,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -125,6 +125,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Autowired
     private IUserSubscribeService iUserSubscribeService;
 
+    @Autowired
+    private IUserProfileService iUserProfileService;
+
 
 
     @Override
@@ -455,9 +458,20 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             }
             String fullName = goodsUserVo.getEducationName()+goodsUserVo.getBusinessName()+goodsUserVo.getProjectName();
             goodsUserVo.setErJianErZao(false);
+            goodsUserVo.setUserProfile(0);
             if(Validator.isNotEmpty(fullName)){
                 if(fullName.equals("继续教育二级建造师")||fullName.equals("继续教育二级造价师")){
                     goodsUserVo.setErJianErZao(true);
+                }else if (fullName.contains("考前培训施工现场专业人员")){
+                    //七大员新考 判断是否提交学员资料
+                    int count = iUserProfileService.count(new LambdaQueryWrapper<UserProfile>()
+                            .notIn(UserProfile::getStatus, Arrays.asList(3, -1))
+                            .eq(UserProfile::getUserId, goodsUserVo.getUserId())
+                            .eq(UserProfile::getGoodsId, goodsUserVo.getGoodsId())
+                            .eq(UserProfile::getCurrentStatus, 1));
+                    if (count > 0){
+                        goodsUserVo.setUserProfile(1);
+                    }
                 }
             }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -1154,7 +1154,6 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
                     Major major = iMajorService.getById(goods.getMajorId());
                     if (ObjectUtils.isNotNull(major)){
                         JSONObject json = JSONObject.parseObject(userProfile.getKeyValue());
-                        //头像
                         JSONObject sign = JSONObject.parseObject(JSONObject.toJSONString(json.get("commitment_electr_signature")));
                         handleFile(sign,idCard,toPath,"commitment_electr_signature",major.getCategoryName());
                     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -415,4 +415,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("大于0开始学习")
 	private Integer studyStatus;
+
+	@ApiModelProperty("学员资料是否已提交（七大员）：1是 0否")
+	private Integer userProfile;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -151,4 +151,7 @@ public class ClassGradeQueryBo extends BaseEntity {
 	private String businessNameTwo;
 
 	private String educationName;
+
+	@ApiModelProperty("班级标识：1共享 2独立")
+	private Integer classSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -1003,6 +1003,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 
     @Override
     public Integer queryOfficialGradeCount(ClassGradeQueryBo bo) {
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        if (ObjectUtils.isNotNull(tenantId)){
+            SysOldOrg one = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
+            if (ObjectUtils.isNotNull(one)){
+                bo.setClassSign(one.getShareClass());
+            }
+        }
         return baseMapper.queryOfficialGradeCount(bo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderBusinessBo.java

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.order.bo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年08月07日 15:08
+ */
+@Data
+public class OrderBusinessBo implements Serializable {
+
+    private String orderSn;
+
+    private Long orderGoodsId;
+}

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

@@ -321,8 +321,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 }
                 //成本 = 订单成本+供应商数量结算成本+供应商时间结算成本
                 BigDecimal cost = getInstTimeSettleCost(item);
-                BigDecimal add = item.getOrderCost().add(cost).add(item.getInstCost());
-                item.setOrderCost(add);
+                if (ObjectUtils.isNotNull(cost)){
+                    BigDecimal instCost = ObjectUtils.isNotNull(item.getInstCost())?item.getInstCost():BigDecimal.ZERO;
+                    BigDecimal add = item.getOrderCost().add(cost).add(instCost);
+                    item.setOrderCost(add);
+                }
                 //退款审核角色
                 if (Arrays.asList(0, 2).contains(item.getRefundStatus())) {
                     String refundSn = "";

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/mapper/TopInstSettleMapper.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.top.settle.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderBusinessBo;
 import com.zhongzheng.modules.top.settle.bo.SettleQueryBo;
 import com.zhongzheng.modules.top.settle.domian.TopInstSettle;
 import com.zhongzheng.modules.top.settle.vo.SettleVo;
@@ -19,6 +20,8 @@ public interface TopInstSettleMapper extends BaseMapper<TopInstSettle> {
 
     String getGoodsBusinessName(@Param("orderSn") String orderSn,@Param("orderGoodsId") Long orderGoodsId);
 
+    List<String> getGoodsBusinessNameList(OrderBusinessBo bo);
+
     List<Long> getOrderGoodsByBusiness(@Param("orderSn") String orderSn,@Param("tpBusinessName") String tpBusinessName);
 
     List<SettleVo> getSettleList(SettleQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/service/impl/ITopInstSettleServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.order.bo.OrderBusinessBo;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.service.IOrderGoodsService;
@@ -1006,6 +1007,13 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                     User user = userService.getById(order.getUserId());
                     orderVo.setUserName(user.getRealname());
                     orderVo.setUserCard(EncryptHandler.decrypt(user.getIdCard()));
+                    //业务层次
+                    OrderBusinessBo bo = new OrderBusinessBo();
+                    bo.setOrderSn(order.getOrderSn());
+                    List<String> nameList = baseMapper.getGoodsBusinessNameList(bo);
+                    if (CollectionUtils.isEmpty(nameList)){
+                        orderVo.setBusinessNames(nameList);
+                    }
                 } else {
                     TopOldOrder oldOrder = topOldOrderService.getOne(new LambdaQueryWrapper<TopOldOrder>().eq(TopOldOrder::getOrderSn, item.getOrderSn()));
                     orderVo.setCreateNo(oldOrder.getCreateNo());
@@ -1014,6 +1022,14 @@ public class ITopInstSettleServiceImpl extends ServiceImpl<TopInstSettleMapper,
                     TopOldOrderGoods orderGoods = topOldOrderGoodsService.getById(item.getOrderGoodsId());
                     orderVo.setUserName(orderGoods.getUserName());
                     orderVo.setUserCard(EncryptHandler.decrypt(orderGoods.getUserCard()));
+                    //业务层次
+                    OrderBusinessBo bo = new OrderBusinessBo();
+                    bo.setOrderSn(oldOrder.getOrderSn());
+                    bo.setOrderGoodsId(orderGoods.getOrderGoodsId());
+                    List<String> nameList = baseMapper.getGoodsBusinessNameList(bo);
+                    if (CollectionUtils.isEmpty(nameList)){
+                        orderVo.setBusinessNames(nameList);
+                    }
                 }
                 return orderVo;
             }).collect(Collectors.toList());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/settle/vo/NumSettleOrderVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author yangdamao
@@ -46,4 +47,7 @@ public class NumSettleOrderVo implements Serializable {
 
     @ApiModelProperty("订单商品ID")
     private Long orderGoodsId;
+
+    @ApiModelProperty("订单业务层次")
+    private List<String> businessNames;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/CommitmentSealBo.java

@@ -0,0 +1,22 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yangdamao
+ * @date 2023年08月07日 16:26
+ */
+@Data
+public class CommitmentSealBo implements Serializable {
+
+    @ApiModelProperty("承诺书图片地址")
+    private String imageUrl;
+
+    @ApiModelProperty("")
+    private Long id;
+
+    private Long userId;
+}

zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml

@@ -143,6 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         DELETE FROM course_file WHERE handouts_id = #{handoutsId} AND tenant_id = #{tenantId}
     </delete>
 
+    <delete id="removeHandoutsRecord" parameterType="java.lang.Long" >
+        DELETE FROM sys_goods_copy_record WHERE new_id = #{handoutsId} AND tenant_id = #{tenantId} AND type = 15
+    </delete>
+
     <select id="getHandoutsListByTenant" parameterType="map" resultType="com.zhongzheng.modules.course.domain.CourseHandouts" >
         SELECT * FROM `course_handouts` WHERE encoder = #{encoder} AND handouts_name = #{handoutsName} AND tenant_id = #{tenantId}
     </select>

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -892,7 +892,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  WHERE
                      cg.official_name = #{officialName}
                    AND cgu.`status` = 1
-                   AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
+                    <if test="classSign != null">
+                        AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = #{classSign}) > 0
+                    </if>
              ) + (
                  SELECT
                      count(*)
@@ -902,7 +904,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  WHERE
                      cg.official_name = #{officialName}
                    AND cgu.`status` = 1
-                   AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = 1) > 0
+                    <if test="classSign != null">
+                        AND (SELECT COUNT(*) FROM sys_old_org sog WHERE sog.tenant_id = cgu.tenant_id AND sog.share_class = #{classSign}) > 0
+                    </if>
              ))
 
     </select>

zhongzheng-system/src/main/resources/mapper/modules/settle/ExamActivityMapper.xml

@@ -38,6 +38,16 @@
             ct.tp_id = #{id}
     </select>
 
+    <select id="getGoodsBusinessNameList" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessBo" resultType="java.lang.String">
+        SELECT business_name FROM v_top_order_business WHERE 1=1
+        <if test="orderSn != null and orderSn != ''">
+            AND order_sn = #{orderSn}
+        </if>
+        <if test="orderGoodsId != null and orderGoodsId != ''">
+            AND order_goods_id = #{orderGoodsId}
+        </if>
+    </select>
+
     <select id="getGoodsBusinessName" parameterType="map" resultType="java.lang.String">
         SELECT business_full_name FROM v_top_order_business WHERE order_goods_id = #{orderGoodsId} AND order_sn = #{orderSn}
     </select>