Merge remote-tracking branch 'origin/master-base' into master-base

chenjiahe

2024-08-09 97474a22708662c7201e4418712a818facb72798

Merge remote-tracking branch 'origin/master-base' into master-base

 phi_platform_common/src/main/java/com/hx/phip/dto/card/CardDto.java

@@ -1,13 +1,13 @@
package com.hx.phip.dto.card;

import com.hx.phip.dto.PageDto;
import com.hz.his.dto.card.CardQueryDto;

/**
 * 卡项扩展
 *
 * @author fwq
 */
public class CardDto extends PageDto {
public class CardDto extends CardQueryDto {

    /**卡项标识*/
    private String cardId;

 phi_platform_user/src/main/java/com/hx/phip/util/api/OrderCreateUtil.java

@@ -2910,7 +2910,10 @@
            sqlSentence.sqlSentence(" SELECT er.*,s.name AS shopName FROM employee_role AS er " +
                    " LEFT JOIN shop AS s ON s.id = er.shopId WHERE er.id = #{m.id}",sqlMap);
            EmployeeRole employeeRole = commonService.selectOne(EmployeeRoleMapper.class,sqlSentence);

            //助手登录会更新Employee表的roleId字段,理论上应该要传操作人角色信息过来,而不是用这个字段
            if (employeeRole == null){
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"开单人角色信息获取异常,请联系管理员!");
            }

            OrdersTotalDto ordersTotalDto=new OrdersTotalDto();
            ordersTotalDto.setTotal(ordersTotal.getShouldTotal().add(ordersTotal.getDiscountTotal()));
@@ -2984,6 +2987,10 @@
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"营销助手审批:未找到操作人员工信息！");
            }
            EmployeeRole employeeRole = commonService.selectOneByKeyBlob(EmployeeRoleMapper.class, employee.getRoleId());
            //助手登录会更新Employee表的roleId字段,理论上应该要传操作人角色信息过来,而不是用这个字段
            if (employeeRole == null){
                throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"开单人角色信息获取异常,请联系管理员!");
            }

            OrdersTotalDto ordersTotalDto=new OrdersTotalDto();
            ordersTotalDto.setTotal(ordersTotal.getShouldTotal().add(ordersTotal.getDiscountTotal()));