Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml

@@ -400,7 +400,7 @@
         ) b
         left join sa_order so
         on so.pk_id = b.pk_order
-        LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
+        LEFT JOIN cu_member tar ON b.pk_member = tar.pk_id
         LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
         left join cu_member_settle_period cp
         on b.period = cp.pk_id

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml

@@ -89,7 +89,7 @@
         <if test="bonusParam.orderType != null">
             and so.order_type = #{bonusParam.orderType}
         </if>
-        LEFT JOIN cu_member tar ON b.PK_SOURCE_MEMBER = tar.pk_id
+        LEFT JOIN cu_member tar ON b.pk_member = tar.pk_id
         LEFT JOIN cu_member cu ON b.PK_SOURCE_MEMBER = cu.pk_id
         left join cu_member_settle_period cp
         on b.period = cp.pk_id

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java

@@ -3,6 +3,7 @@ package com.hzs.member.base.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
+import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,7 +34,9 @@ public interface CuMemberRetailDetailMapper extends BaseMapper<CuMemberRetailDet
                                            @Param("stageStatus")Integer stageStatus,
                                            @Param("settleTableName")String settleTableName);
 
-    List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(@Param("settleTableName") String settleTableName,
+    CuMemberPointDetailVO getPointDetail(@Param("pointMemberCode") Long pointMemberCode);
+
+    List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailDTOList(@Param("settleTableName") String settleTableName,
                                                                    @Param("memberCode") String memberCode,
                                                                    @Param("stage") Integer stage,
                                                                    @Param("stageStatus") Integer stageStatus);

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java

@@ -3,6 +3,7 @@ package com.hzs.member.base.service;
 import cn.hutool.core.lang.tree.Tree;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
+import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
 
 import java.util.List;
@@ -21,4 +22,7 @@ public interface ICumemberRetailDetailService {
     List<ChildCodeVO> getChildListByUserId(Long userId, Integer stage, Integer stageStatus, String settleTableName);
 
     List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus);
+
+    CuMemberPointDetailVO getPointDetail(Long pointMemberCode);
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.hzs.member.base.mapper.CuMemberRetailDetailMapper;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.ICumemberRetailDetailService;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
+import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -106,14 +107,12 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl<CuMemberRetail
 
     @Override
     public List<CuMemberThreeFrameworkVO> getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus) {
-        List<CuMemberThreeFrameworkVO> cuMemberRetailDetailList = baseMapper.getCuMemberRetailDetailList(settleTableName, memberCode, stage, stageStatus);
+        return baseMapper.getCuMemberRetailDetailDTOList(settleTableName, memberCode, stage, stageStatus);
-        if (cuMemberRetailDetailList == null || cuMemberRetailDetailList.isEmpty()) {
-            return null;
-        }else {
-            // 构建map
-            cuMemberRetailDetailList.forEach(CuMemberThreeFrameworkVO::buildMemberMaps);
     }
-        return cuMemberRetailDetailList;
+
+    @Override
+    public CuMemberPointDetailVO getPointDetail(Long pointMemberCode) {
+        return baseMapper.getPointDetail(pointMemberCode);
     }
 
     private Map<String, Object> makeNode(String id, String parentId, String label,Integer pointMember,

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java

@@ -9,11 +9,15 @@ import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
+import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.security.service.UserTokenService;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
+import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.ICumemberRetailDetailService;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
+import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
+import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
 import com.hzs.system.sys.dto.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +50,9 @@ public class ApiMemberStructureController extends BaseController {
     @Autowired
     ICumemberRetailDetailService iCumemberRetailDetailService;
 
+    @Autowired
+    ICuMemberService iCuMemberService;
+
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE, business = EOperationBusiness.MEMBER_RETAIL_TREE, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework")
     public AjaxResult Framework(Integer stage,String childNode,Integer stageStatus) {
@@ -116,6 +123,51 @@ public class ApiMemberStructureController extends BaseController {
         return AjaxResult.success(childCodeList);
     }
 
+    @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
+    @GetMapping("/three-framework-list")
+    public AjaxResult threeFrameworkList(Integer stage,Integer stageStatus) {
+        if (stage == null) {
+            log.error("参数错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        Long userId = SecurityUtils.getUserId();
+        if (userId == null) {
+            log.error("用户登录信息错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        // 获取当前时间 -1 天
+        String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        // 查询相关日结表
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday);
+        log.info("日结信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId();
+        log.info("日结表名称{}",settleTableName);
+        // 校验当前日结表是否存在
+        Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
+        if (isFind == null || isFind != 1) {
+            log.error("当前会员日结信息不存在{}",settleTableName);
+            return AjaxResult.error("数据查询错误,请联系客服处理");
+        }
+        startPage();
+        // 查询当前会员所有子点位信息
+        CuMember member = iCuMemberService.getMember(userId);
+        List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus);
+        return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
+    }
+
+    @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
+    @GetMapping("/pointDetail")
+    public AjaxResult pointDetail(Long pointMemberCode) {
+        if (pointMemberCode == null) {
+            log.error("参数错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetail(pointMemberCode);
+        if (cuMemberPointDetailVO == null) {
+            return null;
+        }
+        return AjaxResult.success(cuMemberPointDetailVO);
+    }
 
 //    @Autowired
 //    private ITransactionCommonService iTransactionCommonService;

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java

@@ -33,6 +33,7 @@ import com.hzs.member.achieve.service.ICuMemberTreeService;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.ICumemberRetailDetailService;
 import com.hzs.member.structure.controller.vo.ChildCodeVO;
+import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO;
 import com.hzs.member.structure.controller.vo.CuMemberSettlePeriodVo;
 import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO;
 import com.hzs.system.config.IGradeServiceApi;
@@ -274,6 +275,20 @@ public class MemberStructureController extends BaseController {
         return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
     }
 
+    @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
+    @GetMapping("/pointDetail")
+    public AjaxResult pointDetail(Long pointMemberCode) {
+        if (pointMemberCode == null) {
+            log.error("参数错误");
+            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+        }
+        CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetail(pointMemberCode);
+        if (cuMemberPointDetailVO == null) {
+            return null;
+        }
+        return AjaxResult.success(cuMemberPointDetailVO);
+    }
+
     /**
      * 查询子节点
      * @param memberSettlePeriodId

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberPointDetailVO.java

@@ -0,0 +1,29 @@
+package com.hzs.member.structure.controller.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class CuMemberPointDetailVO {
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+    /**
+     * 荣誉奖衔
+     */
+    private String awardsName;
+    /**
+     * 隶属体系
+     */
+    private String vertexName;
+}

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/vo/CuMemberThreeFrameworkVO.java

@@ -1,182 +1,159 @@
 package com.hzs.member.structure.controller.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
+import java.io.Serializable;
-import java.util.HashMap;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class CuMemberThreeFrameworkVO {
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class CuMemberThreeFrameworkVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 阶段状态（0=已完成，1=未完成）
      */
     private Integer stageStatus;
 
     /**
-     * 阶段完成时间
+     * 阶段
      */
-    private Date stageDate;
+    private Integer stage;
+    /**
+     * 子点位
+     */
+    private Integer childNode;
 
 
     /**
      * 点位1-1会员ID
      */
-    private Long pointMember11;
+    private String pointMemberName11;
     /**
-     * 点位1-1会员子节点
+     * 点位1-1会员ID
      */
-    private String point11;
+    private String pointMemberCode11;
 
     /**
      * 点位1-2会员ID
      */
-    private Long pointMember12;
+    private String pointMemberName12;
     /**
-     * 点位1-2会员子节点
+     * 点位1-1会员ID
      */
-    private String point12;
+    private String pointMemberCode12;
 
     /**
      * 点位2-1会员ID
      */
-    private Long pointMember21;
+    private String pointMemberName21;
     /**
-     * 点位2-1会员子节点
+     * 点位1-1会员ID
      */
-    private String point21;
+    private String pointMemberCode21;
 
     /**
      * 点位2-2会员ID
      */
-    private Long pointMember22;
+    private String pointMemberName22;
     /**
-     * 点位2-2会员子节点
+     * 点位1-1会员ID
      */
-    private String point22;
+    private String pointMemberCode22;
 
     /**
      * 点位2-3会员ID
      */
-    private Long pointMember23;
+    private String pointMemberName23;
     /**
-     * 点位2-3会员子节点
+     * 点位1-1会员ID
      */
-    private String point23;
+    private String pointMemberCode23;
 
     /**
      * 点位2-4会员ID
      */
-    private Long pointMember24;
+    private String pointMemberName24;
     /**
-     * 点位2-4会员子节点
+     * 点位1-1会员ID
      */
-    private String point24;
+    private String pointMemberCode24;
 
     /**
      * 点位3-1会员ID
      */
-    private Long pointMember31;
+    private String pointMemberName31;
     /**
-     * 点位3-1会员子节点
+     * 点位1-1会员ID
      */
-    private String point31;
+    private String pointMemberCode31;
 
     /**
      * 点位3-2会员ID
      */
-    private Long pointMember32;
+    private String pointMemberName32;
     /**
-     * 点位3-2会员子节点
+     * 点位1-1会员ID
      */
-    private String point32;
+    private String pointMemberCode32;
 
     /**
      * 点位3-3会员ID
      */
-    private Long pointMember33;
+    private String pointMemberName33;
     /**
-     * 点位3-3会员子节点
+     * 点位1-1会员ID
      */
-    private String point33;
+    private String pointMemberCode33;
 
     /**
      * 点位3-4会员ID
      */
-    private Long pointMember34;
+    private String pointMemberName34;
     /**
-     * 点位3-4会员子节点
+     * 点位1-1会员ID
      */
-    private String point34;
+    private String pointMemberCode34;
 
     /**
      * 点位3-5会员ID
      */
-    private Long pointMember35;
+    private String pointMemberName35;
     /**
-     * 点位3-5会员子节点
+     * 点位1-1会员ID
      */
-    private String point35;
+    private String pointMemberCode35;
 
     /**
      * 点位3-6会员ID
      */
-    private Long pointMember36;
+    private String pointMemberName36;
     /**
-     * 点位3-6会员子节点
+     * 点位1-1会员ID
      */
-    private String point36;
+    private String pointMemberCode36;
 
     /**
      * 点位3-7会员ID
      */
-    private Long pointMember37;
+    private String pointMemberName37;
     /**
-     * 点位3-7会员子节点
+     * 点位1-1会员ID
      */
-    private String point37;
+    private String pointMemberCode37;
 
     /**
      * 点位3-8会员ID
      */
-    private Long pointMember38;
+    private String pointMemberName38;
     /**
-     * 点位3-8会员子节点
+     * 点位1-1会员ID
      */
-    private String point38;
+    private String pointMemberCode38;
-
-    @TableField(exist = false)
-    HashMap<String,Long> memberMaps = new HashMap<>(14);
-
-    public void buildMemberMaps() {
-        memberMaps.clear();
-
-        putIntoMap(point11, pointMember11);
-        putIntoMap(point12, pointMember12);
-        putIntoMap(point21, pointMember21);
-        putIntoMap(point22, pointMember22);
-        putIntoMap(point23, pointMember23);
-        putIntoMap(point24, pointMember24);
-        putIntoMap(point31, pointMember31);
-        putIntoMap(point32, pointMember32);
-        putIntoMap(point33, pointMember33);
-        putIntoMap(point34, pointMember34);
-        putIntoMap(point35, pointMember35);
-        putIntoMap(point36, pointMember36);
-        putIntoMap(point37, pointMember37);
-        putIntoMap(point38, pointMember38);
-    }
-    private void putIntoMap(String key, Long value) {
-        memberMaps.put(key != null ? key : "", value);
-    }
 
 
 }

bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml

@@ -62,41 +62,98 @@
             and cud.STAGE_STATUS = #{stageStatus}
         </if>
     </select>
-    <select id="getCuMemberRetailDetailList"
+    <select id="getPointDetail" resultType="com.hzs.member.structure.controller.vo.CuMemberPointDetailVO">
+        SELECT
+            cu.MEMBER_CODE,
+            cu.MEMBER_NAME,
+            ba.AWARDS_NAME AS awardsName,
+            bv.VERTEX_NAME AS vertexName
+        FROM
+            CU_MEMBER cu
+                LEFT JOIN BD_AWARDS ba ON cu.PK_AWARDS = ba.PK_ID
+                LEFT JOIN BD_VERTEX bv ON cu.PK_VERTEX = bv.PK_ID
+        WHERE
+            cu.PK_ID = #{pointMemberCode}
+    </select>
+    <select id="getCuMemberRetailDetailDTOList"
             resultType="com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO">
         SELECT
             curd.STAGE_STATUS,
             curd.STAGE_DATE,
-            '1-1' AS point11,
+            curd.CHILD_NODE,
-            curd.POINT_MEMBER_11 AS pointMember11,
+            curd.STAGE,
-            '1-2' AS point12,
+            curd.POINT_MEMBER_11 as pointMemberCode11,
-            curd.POINT_MEMBER_12 AS pointMember12,
+            curd.POINT_MEMBER_12 as pointMemberCode12,
-            '2-1' AS point21,
+            curd.POINT_MEMBER_21 as pointMemberCode21,
-            curd.POINT_MEMBER_21 AS pointMember21,
+            curd.POINT_MEMBER_22 as pointMemberCode22,
-            '2-2' AS point22,
+            curd.POINT_MEMBER_23 as pointMemberCode23,
-            curd.POINT_MEMBER_22 AS pointMember22,
+            curd.POINT_MEMBER_24 as pointMemberCode24,
-            '2-3' AS point23,
+            curd.POINT_MEMBER_31 as pointMemberCode31,
-            curd.POINT_MEMBER_23 AS pointMember23,
+            curd.POINT_MEMBER_32 as pointMemberCode32,
-            '2-4' AS point24,
+            curd.POINT_MEMBER_33 as pointMemberCode33,
-            curd.POINT_MEMBER_24 AS pointMember24,
+            curd.POINT_MEMBER_34 as pointMemberCode34,
-            '3-1' AS point31,
+            curd.POINT_MEMBER_35 as pointMemberCode35,
-            curd.POINT_MEMBER_31 AS pointMember31,
+            curd.POINT_MEMBER_36 as pointMemberCode36,
-            '3-2' AS point32,
+            curd.POINT_MEMBER_37 as pointMemberCode37,
-            curd.POINT_MEMBER_32 AS pointMember32,
+            curd.POINT_MEMBER_38 as pointMemberCode38,
-            '3-3' AS point33,
+            CASE
-            curd.POINT_MEMBER_33 AS pointMember33,
+                WHEN curd.POINT_11 IS NULL THEN NULL
-            '3-4' AS point34,
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_11
-            curd.POINT_MEMBER_34 AS pointMember34,
+                END AS pointMemberName11,
-            '3-5' AS point35,
+            CASE
-            curd.POINT_MEMBER_35 AS pointMember35,
+                WHEN curd.POINT_12 IS NULL THEN NULL
-            '3-6' AS point36,
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_12
-            curd.POINT_MEMBER_36 AS pointMember36,
+                END AS pointMemberName12,
-            '3-7' AS point37,
+            CASE
-            curd.POINT_MEMBER_37 AS pointMember37,
+                WHEN curd.POINT_21 IS NULL THEN NULL
-            '3-8' AS point38,
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_21
-            curd.POINT_MEMBER_38 AS pointMember38
+                END AS pointMemberName21,
+            CASE
+                WHEN curd.POINT_22 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_22
+                END AS pointMemberName22,
+            CASE
+                WHEN curd.POINT_23 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_23
+                END AS pointMemberName23,
+            CASE
+                WHEN curd.POINT_24 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_24
+                END AS pointMemberName24,
+            CASE
+                WHEN curd.POINT_31 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_31
+                END AS pointMemberName31,
+            CASE
+                WHEN curd.POINT_32 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_32
+                END AS pointMemberName32,
+            CASE
+                WHEN curd.POINT_33 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_33
+                END AS pointMemberName33,
+            CASE
+                WHEN curd.POINT_34 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_34
+                END AS pointMemberName34,
+            CASE
+                WHEN curd.POINT_35 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_35
+                END AS pointMemberName35,
+            CASE
+                WHEN curd.POINT_36 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_36
+                END AS pointMemberName36,
+            CASE
+                WHEN curd.POINT_37 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_37
+                END AS pointMemberName37,
+            CASE
+                WHEN curd.POINT_38 IS NULL THEN NULL
+                ELSE cu.MEMBER_NAME || '-' || curd.POINT_38
+                END AS pointMemberName38
         FROM
-            #{settleTableName} curd
+            ${settleTableName} curd
                 LEFT JOIN CU_MEMBER cu ON curd.PK_MEMBER = cu.PK_ID
         WHERE
             cu.MEMBER_CODE = #{memberCode}
@@ -104,5 +161,7 @@
         <if test="stageStatus != null">
             and curd.STAGE_STATUS = #{stageStatus}
         </if>
+        ORDER BY
+            curd.CHILD_NODE
     </select>
 </mapper>

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java

@@ -448,6 +448,11 @@ public class ApiRetailOrderController {
 
         // 确认订单
         String str = iRetailOrderService.confirmOtherOrder(orderParam);
+        SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
+        if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
+            redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
+            return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
+        }
         return confirmOrderReturn(str, orderParam.getPkCreator(), orderParam.getShopList(), orderParam.getOrderCode());
     }