站点新增图片字段，无优惠订单实付金额初始化

entity/src/main/java/com/kym/entity/admin/Station.java

@@ -72,6 +72,20 @@ public class Station extends BaseEntity implements Serializable {
     @JSONField(name = "AreaCode")
     private String areaCode;
 
+    /**
+     * 图片
+     * <p>
+     * FastjsonTypeHandler
+     * 支持 MVC JSON 解析
+     * 不支持 MySQL JSON 解析
+     * <p>
+     * JacksonTypeHandler
+     * 支持 MVC JSON 解析
+     * 支持 MySQL JSON 解析
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONObject picture;
+
     /**
      * 地址
      */

entity/src/main/java/com/kym/entity/admin/vo/StationVo.java

@@ -74,6 +74,20 @@ public class StationVo extends BaseEntity implements Serializable {
     @JSONField(name = "AreaCode")
     private String areaCode;
 
+    /**
+     * 图片
+     * <p>
+     * FastjsonTypeHandler
+     * 支持 MVC JSON 解析
+     * 不支持 MySQL JSON 解析
+     * <p>
+     * JacksonTypeHandler
+     * 支持 MVC JSON 解析
+     * 支持 MySQL JSON 解析
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private JSONObject picture;
+
     /**
      * 地址
      */

mapper/src/main/resources/mappers/admin/StationMapper.xml

@@ -13,6 +13,7 @@
         <result column="station_name" property="stationName" />
         <result column="country_code" property="countryCode" />
         <result column="area_code" property="areaCode" />
+        <result column="picture" property="picture" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="address" property="address" />
         <result column="station_tel" property="stationTel" />
         <result column="service_tel" property="serviceTel" />
@@ -38,7 +39,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, group_id, station_id, operator_id, equipment_owner_id, station_name, country_code, area_code, address, station_tel, service_tel, station_type, station_status, parking_num, location, site_guide, construction, pictures, match_cars, park_info, business_hours, electricity_fee, service_fee, park_fee, payment, support_order, remark, create_time, update_time
+        id, company_id, group_id, station_id, operator_id, equipment_owner_id, station_name, country_code, area_code, picture,address, station_tel, service_tel, station_type, station_status, parking_num, location, site_guide, construction, pictures, match_cars, park_info, business_hours, electricity_fee, service_fee, park_fee, payment, support_order, remark, create_time, update_time
     </sql>
 
 </mapper>

service/src/main/java/com/kym/service/enplus/impl/EnNotifyServiceImpl.java

@@ -268,7 +268,9 @@ public class EnNotifyServiceImpl implements EnNotifyService {
                     .setTotalMoney((int) Math.round(data.getDoubleValue("TotalMoney") * 100))
                     .setStopReason(data.getIntValue("StopReason"))
                     .setSumPeriod(data.getIntValue("SumPeriod"))
-                    .setChargeDetail(data.getString("ChargeDetails"));
+                    .setChargeDetail(data.getString("ChargeDetails"))
+                    // 实付金额初始化为订单总金额
+                    .setPayAmount(chargeOrder.getTotalMoney());
 
             // 获取订单权益，计算订单优惠金额，实付金额，服务费优惠金额
             var orderRechargeRights = orderRechargeRightsService.lambdaQuery()