微信付费接口以及钉钉回调接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DdCallbackController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@RestController
+@RequestMapping("/dd-callback")
+public class DdCallbackController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DingDingController.java

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.CompanyDingding;
+import com.management.platform.entity.DdCallback;
 import com.management.platform.entity.TimeType;
 import com.management.platform.entity.User;
 import com.management.platform.mapper.CompanyDingdingMapper;
+import com.management.platform.mapper.DdCallbackMapper;
 import com.management.platform.mapper.TimeTypeMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.CompanyDingdingService;
@@ -57,6 +59,8 @@ public class DingDingController {
     private CompanyDingdingMapper companyDingdingMapper;
     @Resource
     private TimeTypeMapper timeTypeMapper;
+    @Resource
+    private DdCallbackMapper ddCallbackMapper;
 
     @RequestMapping("/callback")
     public Map<String, String> dingCallback(
@@ -100,6 +104,13 @@ public class DingDingController {
             String eventType = eventJson.getString("EventType");
             bizLogger.info("DingDing回调触发了");
             bizLogger.info(eventJson.toJSONString());
+
+            //存储钉钉回调信息
+            DdCallback ddCallback = new DdCallback();
+            ddCallback.setDecryptMsg(decryptMsg);
+            ddCallback.setEventType(eventType);
+            ddCallbackMapper.insert(ddCallback);
+
             // 4. 根据EventType分类处理
             if ("check_url".equals(eventType)) {
                 // 测试回调url的正确性

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -30,6 +30,7 @@ import org.springframework.web.servlet.view.RedirectView;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.net.URLEncoder;
+import java.sql.Timestamp;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -133,6 +134,8 @@ public class WeiXinCorpController {
     SysRoleFunctionMapper sysRoleFunctionMapper;
     @Resource
     ExpenseTypeService expenseTypeService;
+    @Resource
+    private WxOrderMapper wxOrderMapper;
 
     public static String SUITE_ACCESS_TOKEN = null;
     public static long suiteTokenExpireTime = 0L;
@@ -491,6 +494,16 @@ public class WeiXinCorpController {
             org.json.JSONObject jsonObject = XML.toJSONObject(sMsg);
             log.info("json=="+jsonObject.toString());
             jsonObject = jsonObject.getJSONObject("xml");
+
+            //存储更新订单、更新公司续费情况
+            if (jsonObject.has("OrderId")){
+                boolean b = saveOrderAndUpCompany(jsonObject);
+                if (!b){
+                    System.out.println("+++++++++++++++++++微信应用市场付费回调处理失败+++++++++++++++++++++++");
+                    System.out.println(jsonObject);
+                }
+            }
+
             if(jsonObject.has("Event") && ("subscribe".equals(jsonObject.getString("Event")))){
                 //成员关注应用事件，发生在该企业已经开通应用的情况下。
                 System.out.println("成员关注应用事件!");
@@ -2629,4 +2642,141 @@ public class WeiXinCorpController {
         int cnt = projectAuditorMapper.selectCount(new QueryWrapper<ProjectAuditor>().eq("auditor_id", userId));
         return cnt>0;
     }
+
+    private boolean saveOrderAndUpCompany(org.json.JSONObject jsonObject) throws Exception {
+        System.err.println("+++++++++++++++++++"+"订单回调时间"+"++++++++++++++++++++++");
+        String infoType = jsonObject.getString("InfoType");
+        String suiteAccessToken = getSuiteAccessToken();
+        HttpHeaders headers = new HttpHeaders();
+        RestTemplate restTemplate = new RestTemplate();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+        //版本变更
+        if ("change_editon".equals(infoType)){
+            String url = "https://qyapi.weixin.qq.com/cgi-bin/service/get_auth_info?suite_access_token="+suiteAccessToken;
+            String paidCorpId = jsonObject.getString("PaidCorpId");
+            WxCorpInfo corpid = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("corpid", paidCorpId));
+            Company company = companyMapper.selectById(corpid.getCompanyId());
+            JSONObject map = new JSONObject();
+            map.put("auth_corpid",corpId);
+            map.put("permanent_code",corpid.getPermanentCode());
+            HttpEntity<JSONObject> detailEntity = new HttpEntity<>(map, headers);
+            ResponseEntity<String> detailResponseEntity = restTemplate.postForEntity(url, detailEntity, String.class);
+            JSONObject json = JSONObject.parseObject(detailResponseEntity.getBody());
+            if (json.getInteger("errcode")==0){
+                String editionName = json.getString("edition_name");
+                switch (editionName){
+                    case "工时基础版":
+                        company.setPackageProject(0);
+                        company.setPackageOa(0);
+                        company.setPackageExpense(0);
+                        company.setPackageCustomer(0);
+                        company.setPackageEngineering(0);
+                        company.setPackageProvider(0);
+                        break;
+                    case "项目管理专业版":
+                        company.setPackageProject(1);//项目协作平台
+                        company.setPackageOa(0);//OA平台;请假，出差等
+                        company.setPackageExpense(1);//费用报销
+                        company.setPackageCustomer(0);//客户管理
+                        company.setPackageEngineering(0);//工程专业
+                        company.setPackageProvider(0);//供应商模块
+                        break;
+                    case "建筑工程管理专业版":
+                        company.setPackageProject(1);//项目协作平台
+                        company.setPackageOa(0);//OA平台;请假，出差等
+                        company.setPackageExpense(1);//费用报销
+                        company.setPackageCustomer(1);//客户管理
+                        company.setPackageEngineering(1);//工程专业
+                        company.setPackageProvider(0);//供应商模块
+                        break;
+                    case "企业办公旗舰版":
+                        company.setPackageProject(1);//项目协作平台
+                        company.setPackageOa(1);//OA平台;请假，出差等
+                        company.setPackageExpense(1);//费用报销
+                        company.setPackageCustomer(1);//客户管理
+                        company.setPackageEngineering(0);//工程专业
+                        company.setPackageProvider(1);//供应商模块
+                        break;
+                }
+                companyMapper.updateById(company);
+            }else {
+                System.out.println("++++++++++++++++++++++"+"版本变更失败！"+"++++++++++++++++++++++++");
+                return false;
+            }
+        }else {
+            String orderId = "";
+            if (jsonObject.getString("OrderId")!=null){
+                orderId = jsonObject.getString("OrderId");
+            }else {
+                orderId = jsonObject.getString("NewOrderId");
+            }
+            WxOrder wxOrder = new WxOrder();
+            String detailUrl = " https://qyapi.weixin.qq.com/cgi-bin/service/get_order?suite_access_token=" + suiteAccessToken;
+            JSONObject detailMap = new JSONObject();
+            detailMap.put("orderid",orderId);
+            HttpEntity<JSONObject> detailEntity = new HttpEntity<>(detailMap, headers);
+            ResponseEntity<String> detailResponseEntity = restTemplate.postForEntity(detailUrl, detailEntity, String.class);
+            String body = detailResponseEntity.getBody();
+            JSONObject orderDetail = JSONObject.parseObject(body);
+            if (orderDetail.getInteger("errcode")==0){
+                wxOrder.setOrderid(orderDetail.getString("orderid"));
+                wxOrder.setOrderStatus(orderDetail.getInteger("order_status"));
+                wxOrder.setOrderType(orderDetail.getInteger("order_type"));
+                wxOrder.setPaidCorpid(orderDetail.getString("paid_corpid"));
+                wxOrder.setOperatorId(orderDetail.getString("operator_id"));
+                wxOrder.setSuiteid(orderDetail.getString("suiteid"));
+                wxOrder.setAppid(orderDetail.getString("appid"));
+                wxOrder.setEditionId(orderDetail.getString("edition_id"));
+                wxOrder.setEditionName(orderDetail.getString("edition_name"));
+                wxOrder.setPrice(orderDetail.getDouble("price"));
+                wxOrder.setUserCount(orderDetail.getInteger("user_count"));
+                wxOrder.setOrderPeriod(orderDetail.getInteger("order_period"));
+                LocalDateTime order_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("order_time")/1000,0,ZoneOffset.ofHours(8));
+                wxOrder.setOrderTime(order_time);
+                LocalDateTime paid_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("paid_time")/1000,0,ZoneOffset.ofHours(8));
+                wxOrder.setPaidTime(paid_time);
+                LocalDateTime begin_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("begin_time")/1000,0,ZoneOffset.ofHours(8));
+                wxOrder.setBeginTime(begin_time);
+                LocalDateTime end_time =LocalDateTime.ofEpochSecond(orderDetail.getLong("end_time")/1000,0,ZoneOffset.ofHours(8));
+                wxOrder.setEndTime(end_time);
+                wxOrder.setOrderFrom(orderDetail.getInteger("order_from"));
+                wxOrder.setOperatorCorpid(orderDetail.getString("operator_corpid"));
+                wxOrder.setServiceShareAmount(orderDetail.getString("service_share_amount"));
+                wxOrder.setPlatformShareAmount(orderDetail.getString("platform_share_amount"));
+                wxOrder.setDealerShareAmount(orderDetail.getString("dealer_share_amount"));
+                JSONObject dealer_corp_info = orderDetail.getJSONObject("dealer_corp_info");
+                wxOrder.setDealerCorpid(dealer_corp_info.getString("corpid"));
+                wxOrder.setDealerCorpName(dealer_corp_info.getString("corp_name"));
+                //获取该公司对象
+                WxCorpInfo corpid = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("corpid", wxOrder.getPaidCorpid()));
+                Company company = companyMapper.selectById(corpid.getCompanyId());
+                if ("open_order".equals(infoType)){
+                    wxOrderMapper.insert(wxOrder);
+                }else if ("change_order".equals(infoType)){
+                    wxOrder.setOldOrderid(jsonObject.getString("OldOrderId"));
+                    wxOrderMapper.insert(wxOrder);
+                }else if("pay_for_app_success".equals(infoType)){
+                    wxOrderMapper.updateById(wxOrder);
+                    if (wxOrder.getOrderPeriod().equals(365)){
+                        //若到期时间早已过期，则取当前时间加上开通时长
+                        if (LocalDateTime.now().isAfter(company.getExpirationDate())){
+                            company.setExpirationDate(LocalDateTime.now().plusYears(1));
+                        }else {
+                            company.setExpirationDate(company.getExpirationDate().plusYears(1));
+                        }
+                    }
+                }else if ("refund".equals(infoType)){
+                    wxOrderMapper.updateById(wxOrder);
+                    //退款则将其到期时间设置为现在的时间减去一天
+                    company.setExpirationDate(LocalDateTime.now().minusDays(1));
+                }
+            }else {
+                System.out.println("+++++++++++++"+"微信订单查询更新失败"+"+++++++++++++++");
+                return  false;
+            }
+        }
+        return true;
+    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WxOrderController.java

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@RestController
+@RequestMapping("/wx-order")
+public class WxOrderController {
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/DdCallback.java

@@ -0,0 +1,49 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DdCallback extends Model<DdCallback> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 插入的时间
+     */
+    @TableField("datetime")
+    private LocalDateTime datetime;
+
+    @TableField("event_type")
+    private String eventType;
+
+    @TableField("decrypt_msg")
+    private String decryptMsg;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/WxOrder.java

@@ -0,0 +1,174 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class WxOrder extends Model<WxOrder> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 订单号
+     */
+    @TableId("orderid")
+    private String orderid;
+
+    /**
+     * 改单的原订单号
+     */
+    @TableField("old_orderid")
+    private String oldOrderid;
+
+    /**
+     * 订单状态。0-未支付，1-已支付，2-已关闭， 3-未支付且已过期， 4-申请退款中， 5-申请退款成功， 6-退款被拒绝
+     */
+    @TableField("order_status")
+    private Integer orderStatus;
+
+    /**
+     * 订单类型。0-普通订单，1-扩容订单，2-续期，3-版本变更
+     */
+    @TableField("order_type")
+    private Integer orderType;
+
+    /**
+     * 客户企业的corpid
+     */
+    @TableField("paid_corpid")
+    private String paidCorpid;
+
+    /**
+     * 下单操作人员userid。如果是服务商代下单，没有该字段。
+     */
+    @TableField("operator_id")
+    private String operatorId;
+
+    /**
+     * 应用id
+     */
+    @TableField("suiteid")
+    private String suiteid;
+
+    /**
+     * 应用id。（仅旧套件有该字段）
+     */
+    @TableField("appid")
+    private String appid;
+
+    /**
+     * 购买版本ID
+     */
+    @TableField("edition_id")
+    private String editionId;
+
+    /**
+     * 购买版本名字
+     */
+    @TableField("edition_name")
+    private String editionName;
+
+    /**
+     * 实付款金额，单位分
+     */
+    @TableField("price")
+    private Double price;
+
+    /**
+     * 购买的人数
+     */
+    @TableField("user_count")
+    private Integer userCount;
+
+    /**
+     * 购买的时间，单位天
+     */
+    @TableField("order_period")
+    private Integer orderPeriod;
+
+    /**
+     * 下单时间
+     */
+    @TableField("order_time")
+    private LocalDateTime orderTime;
+
+    /**
+     * 付款时间
+     */
+    @TableField("paid_time")
+    private LocalDateTime paidTime;
+
+    /**
+     * 购买生效期的开始时间
+     */
+    @TableField("begin_time")
+    private LocalDateTime beginTime;
+
+    /**
+     * 购买生效期的结束时间
+     */
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    /**
+     * 下单来源。0-客户下单；1-服务商代下单；2-代理商代下单
+     */
+    @TableField("order_from")
+    private Integer orderFrom;
+
+    /**
+     * 下单方corpid
+     */
+    @TableField("operator_corpid")
+    private String operatorCorpid;
+
+    /**
+     * 服务商分成金额，单位分
+     */
+    @TableField("service_share_amount")
+    private String serviceShareAmount;
+
+    /**
+     * 平台分成金额，单位分
+     */
+    @TableField("platform_share_amount")
+    private String platformShareAmount;
+
+    /**
+     * 代理商分成金额，单位分
+     */
+    @TableField("dealer_share_amount")
+    private String dealerShareAmount;
+
+    @TableField("dealer_corpid")
+    private String dealerCorpid;
+
+    /**
+     * 代理商名
+     */
+    @TableField("dealer_corp_name")
+    private String dealerCorpName;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.orderid;
+    }
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/DdCallbackMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.DdCallback;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+public interface DdCallbackMapper extends BaseMapper<DdCallback> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/WxOrderMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.WxOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+public interface WxOrderMapper extends BaseMapper<WxOrder> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/DdCallbackService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.DdCallback;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+public interface DdCallbackService extends IService<DdCallback> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/WxOrderService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.WxOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+public interface WxOrderService extends IService<WxOrder> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DdCallbackServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.DdCallback;
+import com.management.platform.mapper.DdCallbackMapper;
+import com.management.platform.service.DdCallbackService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@Service
+public class DdCallbackServiceImpl extends ServiceImpl<DdCallbackMapper, DdCallback> implements DdCallbackService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.WxOrder;
+import com.management.platform.mapper.WxOrderMapper;
+import com.management.platform.service.WxOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-11-01
+ */
+@Service
+public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> implements WxOrderService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/DdCallbackMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.DdCallbackMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.DdCallback">
+        <id column="id" property="id" />
+        <result column="datetime" property="datetime" />
+        <result column="event_type" property="eventType" />
+        <result column="decrypt_msg" property="decryptMsg" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, datetime, event_type, decrypt_msg
+    </sql>
+
+</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ParticipationMapper.xml

@@ -16,7 +16,7 @@
 
     <!--根据项目id获取所有参与者id和name-->
     <select id="getParticipator" resultType="java.util.Map">
-        SELECT a.user_id AS id, b.name
+        SELECT a.user_id AS id,b.job_number AS jobNumber, b.name
         FROM participation  a
         LEFT JOIN user  b ON a.user_id = b.id
         WHERE a.project_id = #{projectId}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/WxOrderMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.WxOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.WxOrder">
+        <id column="orderid" property="orderid" />
+        <result column="old_orderid" property="oldOrderid" />
+        <result column="order_status" property="orderStatus" />
+        <result column="order_type" property="orderType" />
+        <result column="paid_corpid" property="paidCorpid" />
+        <result column="operator_id" property="operatorId" />
+        <result column="suiteid" property="suiteid" />
+        <result column="appid" property="appid" />
+        <result column="edition_id" property="editionId" />
+        <result column="edition_name" property="editionName" />
+        <result column="price" property="price" />
+        <result column="user_count" property="userCount" />
+        <result column="order_period" property="orderPeriod" />
+        <result column="order_time" property="orderTime" />
+        <result column="paid_time" property="paidTime" />
+        <result column="begin_time" property="beginTime" />
+        <result column="end_time" property="endTime" />
+        <result column="order_from" property="orderFrom" />
+        <result column="operator_corpid" property="operatorCorpid" />
+        <result column="service_share_amount" property="serviceShareAmount" />
+        <result column="platform_share_amount" property="platformShareAmount" />
+        <result column="dealer_share_amount" property="dealerShareAmount" />
+        <result column="dealer_corpid" property="dealerCorpid" />
+        <result column="dealer_corp_name" property="dealerCorpName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        orderid, old_orderid, order_status, order_type, paid_corpid, operator_id, suiteid, appid, edition_id, edition_name, price, user_count, order_period, order_time, paid_time, begin_time, end_time, order_from, operator_corpid, service_share_amount, platform_share_amount, dealer_share_amount, dealer_corpid, dealer_corp_name
+    </sql>
+
+</mapper>