代码调整

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/utils/DateUtils.java

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.time.DateFormatUtils;
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {
+    public static final String RFC3339 = "yyyy-MM-dd'T'HH:mm:ssXXX";
+
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/CartsApiController.java

@@ -13,7 +13,7 @@ import javax.validation.Valid;
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/carts")
+@RequestMapping("/api/store/carts")
 public class CartsApiController extends BaseApiController {
 
     private final CartsServiceI cartsService;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/HomepageApiController.java

@@ -20,7 +20,6 @@ import com.xingxi.master.product.service.impl.ProdPicServiceImpl;
 import com.xingxi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -31,26 +30,17 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/homepage")
+@RequestMapping("/api/store/homepage")
 public class HomepageApiController extends BaseApiController {
 
-    @Autowired
-    private IBannerService bannerService;
-    @Autowired
-    private IIpInfoService ipInfoService;
-    @Autowired
-    private ISysConfigService configService;
-    @Autowired
-    private IProdClassService prodClassService;
-
-    @Autowired
-    private IPopularProdService leftProdService;
-    @Autowired
-    private ISuggestProdService middleProdService;
-    @Autowired
-    private INewProdService rightProdService;
-    @Autowired
-    private ProdPicServiceImpl prodPicServiceImpl;
+    private final IBannerService bannerService;
+    private final IIpInfoService ipInfoService;
+    private final ISysConfigService configService;
+    private final IProdClassService prodClassService;
+    private final IPopularProdService leftProdService;
+    private final ISuggestProdService middleProdService;
+    private final INewProdService rightProdService;
+    private final ProdPicServiceImpl prodPicServiceImpl;
 
     @GetMapping("/banners")
     public BannerResponse getBanners(){

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/ProdApiController.java

@@ -1,30 +1,25 @@
 package com.xingxi.api.controller;
 
 import com.xingxi.api.common.BaseApiController;
+import com.xingxi.api.data.domain.MercProdRequest;
+import com.xingxi.api.data.domain.MercProdResponse;
 import com.xingxi.api.model.*;
 import com.xingxi.api.service.ProdServiceI;
-import com.xingxi.common.enums.EDelFlag;
-import com.xingxi.common.enums.ERoleKey;
-import com.xingxi.master.product.domain.*;
-import com.xingxi.master.product.service.IProdAttrService;
-import com.xingxi.master.product.service.IProdPicService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/homepage")
+@RequestMapping("/api/store/homepage")
 public class ProdApiController extends BaseApiController {
 
-    @Autowired
-    private ProdServiceI prodService;
+    private final ProdServiceI prodService;
 
     @PostMapping("/prods")
     public MercProdListResponse getProdList(@Valid @RequestBody MercProdRequest request) {

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdRequest.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/MercProdRequest.java

@@ -1,4 +1,4 @@
-package com.xingxi.api.model;
+package com.xingxi.api.data.domain;
 
 import lombok.Data;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdResponse.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/MercProdResponse.java

@@ -1,5 +1,6 @@
-package com.xingxi.api.model;
+package com.xingxi.api.data.domain;
 
+import com.xingxi.api.model.ProdAttrResponse;
 import com.xingxi.master.product.domain.ProdPic;
 import lombok.Data;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/mapper/WxApiProductMapper.java

@@ -1,7 +1,7 @@
 package com.xingxi.api.data.mapper;
 
-import com.xingxi.api.model.MercProdRequest;
-import com.xingxi.api.model.MercProdResponse;
+import com.xingxi.api.data.domain.MercProdRequest;
+import com.xingxi.api.data.domain.MercProdResponse;
 import com.xingxi.master.merchant.mapper.MerchantProdMapper;
 import com.xingxi.master.product.mapper.ProdMapper;
 import org.apache.ibatis.annotations.Mapper;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdListResponse.java

@@ -1,5 +1,6 @@
 package com.xingxi.api.model;
 
+import com.xingxi.api.data.domain.MercProdResponse;
 import lombok.Data;
 import lombok.Value;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/ProdServiceI.java

@@ -1,7 +1,7 @@
 package com.xingxi.api.service;
 
-import com.xingxi.api.model.MercProdRequest;
-import com.xingxi.api.model.MercProdResponse;
+import com.xingxi.api.data.domain.MercProdRequest;
+import com.xingxi.api.data.domain.MercProdResponse;
 
 import java.util.List;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsServiceImpl.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsApiServiceImpl.java

@@ -29,9 +29,8 @@ import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor
-@Service
-@Validated
-class CartsServiceImpl implements CartsServiceI {
+@Service("CartsServiceI")
+class CartsApiServiceImpl implements CartsServiceI {
 
     @Autowired
     CartsMapper cartsMapper;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/ProdServiceImpl.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/ProdApiServiceImpl.java

@@ -1,8 +1,8 @@
 package com.xingxi.api.service.impl;
 
 import com.xingxi.api.data.mapper.WxApiProductMapper;
-import com.xingxi.api.model.MercProdRequest;
-import com.xingxi.api.model.MercProdResponse;
+import com.xingxi.api.data.domain.MercProdRequest;
+import com.xingxi.api.data.domain.MercProdResponse;
 import com.xingxi.api.model.ProdAttrResponse;
 import com.xingxi.api.service.ProdServiceI;
 import com.xingxi.common.enums.EDelFlag;
@@ -24,9 +24,8 @@ import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor
-@Service
-@Validated
-class ProdServiceImpl implements ProdServiceI {
+@Service("ProdServiceI")
+class ProdApiServiceImpl implements ProdServiceI {
 
     @Autowired
     WxApiProductMapper productMapper;

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxApiUserAddressMapper.xml

@@ -2,36 +2,12 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xingxi.api.data.mapper.WxApiProductMapper">
+<mapper namespace="com.xingxi.api.data.mapper.WxApiUserAddressMapper">
 
-    <resultMap id="MercProdResponse" type="MercProdResponse">
-        <id property="mercProdId"    column="mercProdId"/>
-        <result property="mercId" column="mercId"/>
-        <result property="prodClassId"    column="prodClassId"/>
-        <result property="prodId"    column="prodId"/>
-        <result property="prodName"    column="prodName"/>
-        <result property="ipId"    column="ipId"/>
-        <result property="designerId"    column="designerId"/>
-        <result property="description"    column="description"/>
-        <result property="prodStatus"    column="prodStatus"/>
-        <result property="thirdIdConfirmFlag"    column="thirdIdConfirmFlag"/>
-        <result property="delFlag"    column="delFlag"/>
-    </resultMap>
+    <update id="clearDefaultFlag" parameterType="Long">
+        update t_user_address
+        set defaultFlag = '0'
+        where user_id = #{userId}
+    </update>
 
-    <select id="selectProductList" parameterType="MercProdRequest" resultMap="MercProdResponse">
-        SELECT mmp.mercProdId,mmp.mercId,mp.prodClassId,mmp.prodId,mp.prodName,mp.idId,mp.designerId,mp.description,mp.prodStatus,mmp.delFlag
-        FROM m_merchant_prod mmp
-        LEFT JOIN m_prod mp ON mmp.prodId = mp.id
-        <where>
-            mmp.shelfFlag = '1'
-            AND mmp.delFlag = '0'
-            <if test="mercProdId != null ">AND mmp.mercProdId = #{mercProdId}</if>
-            <if test="mercId != null ">AND mmp.mercId = #{mercId}</if>
-            <if test="prodId != null ">AND mmp.prodId = #{prodId}</if>
-            <if test="prodAttrId != null">AND mmp.prodAttrId = #{prodAttrId} </if>
-            <if test="prodClassId != null">AND mp.prodClassId = #{prodClassId} </if>
-            <if test="ipId != null">AND mp.ipId = #{ipId} </if>
-            <if test="prodName != null and prodName != ''">AND mp.prodName like concat('%',#{prodName},'%')</if>
-        </where>
-    </select>
 </mapper>

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-local.yml

@@ -26,17 +26,12 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: "jdbc:mysql://47.98.241.144:3306/biandan_test?useSSL=false&useTimezone=true&serverTimezone=GMT%2B8"
     url: "jdbc:mysql://47.99.85.139:3306/GoodsMarket?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"
     username: gululuq
     password: f^*n%QfvekP!0Rur
-#    url: "jdbc:mysql://47.98.144.243:3306/empress?useSSL=false&useTimezone=true&serverTimezone=GMT%2B8"
-#    username: "root"
-    #password: $TyH69i4EEG^om!!
-#    password: X8IGlcnhdUcDGawphPHww8z7Xu4a800fhPr9Y6FGquTAAjSsrfhz1+VWYjGyO7pr4Ef5rs4QGpLPA4//mq2gNA==
     druid:
-      publickey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuY2YFPanMmwVxHazZdOZ/y/LZr1+ZmyzAhstDZ0lCn4Vc3DI7Iw10+w4XJVGD3fnLjFMbPL1ip9eclpTAu6G0CAwEAAQ==
-      connectionProperties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.publickey}
+#      publickey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJuY2YFPanMmwVxHazZdOZ/y/LZr1+ZmyzAhstDZ0lCn4Vc3DI7Iw10+w4XJVGD3fnLjFMbPL1ip9eclpTAu6G0CAwEAAQ==
+#      connectionProperties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.publickey}
       initialSize: 5
       minIdle: 10
       maxActive: 20
@@ -97,7 +92,15 @@ wx:
     width: 420
     checkPath: false
     envVersion: develop
-
+    pay:
+      domain: http://fmp.njnet.vip
+      appId: aaaaa
+      mchId: 1658989336 #商户id
+      apiV3Key: bbbbb #V3密钥
+      certSerialNo: ccccc
+      privateKeyPath: classpath:wxcert/apiclient_key.pem #apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径
+      privateCertPath: classpath:wxcert/apiclient_cert.pem #apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径
+      notifyUrl: https://fmp.njnet.vip/api/xinbao/wxpay/callback
 idworkcfg:
   workerId: "1"
   dataCenterId: "9"

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-release.yml

@@ -81,7 +81,7 @@ mybatis:
 logging:
   config: classpath:logback-release.xml
   level:
-    cn.com.wingxi.biandan: debug
+    cn.com.xingxi: debug
     org.springframework: warn
     org.apache.http: info
 wx:

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-test.yml

@@ -80,7 +80,7 @@ mybatis:
 logging:
   config: classpath:logback-test.xml
   level:
-    "cn.com.wingxi.biandan": debug
+    "cn.com.xingxi": debug
     org.springframework: warn
     org.apache.http: info
 wx:

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
       max-request-size: 20MB
 
 mybatis:
-  typeAliasesPackage: com.wingxi.**.domain
+  typeAliasesPackage: com.xingxi.**.domain
   mapperLocations: classpath*:META-INF/sqlmap/**.xml,classpath*:mapper/**/**.xml
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/logback-local.xml

@@ -72,7 +72,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="cn.com.wingxi.xingxi" level="debug" />
+	<logger name="cn.com.xingxi" level="debug" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/logback-spring.xml

@@ -9,10 +9,10 @@
 
 
     <springProfile name="local,default,test">
-        <logger name="cn.com.wingxi.xingxi.store" level="DEBUG"/>
+        <logger name="cn.com.xingxi.store" level="DEBUG"/>
         <logger name="org.springframework.security" level="DEBUG"/>
         <logger name="org.springframework.web" level="DEBUG"/>
-        <logger name="cn.com.wingxi.xingxi.unifiedpay" level="DEBUG"/>
+        <logger name="cn.com.xingxi.unifiedpay" level="DEBUG"/>
         <root level="ERROR">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="FILE"/>

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application-local.yml

@@ -84,7 +84,7 @@ spring:
 logging:
   config: classpath:logback-local.xml
   level:
-    "cn.com.wingxi.biandan": debug
+    "cn.com.xingxi": debug
     org.springframework: warn
     org.apache.http: info
 shdzfp:

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application-release.yml

@@ -85,7 +85,7 @@ spring:
 logging:
   config: classpath:logback-prod.xml
   level:
-    cn.com.wingxi.biandan: info
+    cn.com.xingxi: info
     org.springframework: info
     org.apache.http: info
 shdzfp:

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application-test.yml

@@ -83,7 +83,7 @@ spring:
 logging:
   config: classpath:logback-test.xml
   level:
-    "cn.com.wingxi.biandan": debug
+    "cn.com.xingxi": debug
     org.springframework: warn
     org.apache.http: info
 shdzfp:

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application.yml

@@ -28,7 +28,7 @@ spring:
 # MyBatis
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: cn.com.wingxi.biandan.**.domain
+  typeAliasesPackage: cn.com.xingxi.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/Order/domain/Order.java

@@ -34,30 +34,14 @@ public class Order extends BaseEntity {
     @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date payTime;
+
     // 订单状态
     @Excel(name = "订单状态", dictType = "orderStatus")
     private String orderStatus;
 
-    // 订单类别
-    @Excel(name = "订单类别", dictType = "orderType")
-    private String orderType;
-
-    // 优定团编号
-    @Excel(name = "优定团编号")
-    private Long groupId;
-
-    // 楼号
-    @Excel(name = "楼号")
-    private String buildingNo;
-
-    // 房号
-    @Excel(name = "房号")
-    private String roomNo;
-
-    // 跟团号
-    @Excel(name = "跟团号")
-    private Integer groupNo;
-
     // 订单总额
     @Excel(name = "订单总额")
     private BigDecimal orderAmount;
@@ -74,42 +58,10 @@ public class Order extends BaseEntity {
     @Excel(name = "购方用户ID")
     private Long buyerId;
 
-    // 购方用户角色
-    @Excel(name = "购方用户角色")
-    private String buyerRole;
-
     // 销方用户ID
     @Excel(name = "销方用户ID")
     private Long sellerId;
 
-    // 销方用户角色
-    @Excel(name = "销方用户角色")
-    private String sellerRole;
-
-    // 收款方ID
-    @Excel(name = "收款方ID")
-    private Long payeeId;
-
-    // 收款方角色
-    @Excel(name = "收款方角色")
-    private String payeeRole;
-
-    // 推荐人用户ID
-    @Excel(name = "推荐人用户ID")
-    private Long referrerId;
-
-    // 推荐人用户角色
-    @Excel(name = "推荐人用户角色")
-    private String referrerRole;
-
-    // 推荐人分佣比率
-    @Excel(name = "推荐人分佣比率")
-    private BigDecimal referrerRate;
-
-    // 平台服务费率
-    @Excel(name = "平台服务费率")
-    private BigDecimal serviceRate;
-
     // 取消时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "取消时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -120,29 +72,17 @@ public class Order extends BaseEntity {
     @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    // 收件人省
-    @Excel(name = "收件人省")
-    private Long recProvId;
-
     // 收件人省名称
     @Excel(name = "收件人省名称")
-    private String recProvName;
-
-    // 收件人市
-    @Excel(name = "收件人市")
-    private Long recCityId;
+    private String recProv;
 
     // 收件人市名称
     @Excel(name = "收件人市名称")
-    private String recCityName;
-
-    // 收件人区
-    @Excel(name = "收件人区")
-    private Long recAreaId;
+    private String recCity;
 
     // 收件人区名称
     @Excel(name = "收件人区名称")
-    private String recAreaName;
+    private String recDistrict;
 
     // 收件人地址
     @Excel(name = "收件人地址")
@@ -154,9 +94,12 @@ public class Order extends BaseEntity {
 
     // 收件人联系方式
     @Excel(name = "收件人联系方式")
-    private String recPhone;
+    private String recMobile;
+
+    @Excel(name = "备注")
+    private String remark;
 
     // 删除标志（0代表存在 2代表删除）
-    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,1=代表删除")
     private String delFlag;
 }

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/Order/domain/OrderDetail.java

@@ -29,9 +29,9 @@ public class OrderDetail extends BaseEntity {
     @Excel(name = "订单ID")
     private Long orderId;
 
-    // 套组ID
-    @Excel(name = "套组ID")
-    private String suiteId;
+    // 订单明细状态
+    @Excel(name = "订单明细状态")
+    private String orderDetailStatus;
 
     // 商品ID
     @Excel(name = "商品ID")
@@ -43,59 +43,19 @@ public class OrderDetail extends BaseEntity {
 
     // 属性组合编号
     @Excel(name = "属性组合编号")
-    private Long pprId;
+    private Long prodAttrId;
 
     // 属性组合名称
     @Excel(name = "属性组合名称")
-    private String pprName;
-
-    // 用户设计编号
-    @Excel(name = "用户设计编号")
-    private String upId;
-
-    // 元商品ID
-    @Excel(name = "元商品ID")
-    private Long orgProdId;
-
-    // 商品区分
-    @Excel(name = "商品区分")
-    private String prodType;
-
-    // 素材ID
-    @Excel(name = "素材ID")
-    private Long mateId;
-
-    // 素材名称
-    @Excel(name = "素材名称")
-    private String mateName;
-
-    // 素材区分
-    @Excel(name = "素材区分")
-    private String mateType;
-
-    // 平台经销标志 0：供应商直销，1：平台经销
-    @Excel(name = "平台经销标志")
-    private String pfSellFlag;
-
-    // 平台服务费率（供应商）
-    @Excel(name = "平台服务费率（供应商）")
-    private BigDecimal vendorServiceRate;
+    private String prodAttrName;
 
     // 供应商ID
     @Excel(name = "供应商ID")
     private Long vendorId;
 
-    // 设计面数量
-    @Excel(name = "设计面数量")
-    private Integer surfaceQty;
-
-    // 单位数量
-    @Excel(name = "单位数量")
-    private Integer unitQty;
-
     // 购买数量
     @Excel(name = "购买数量")
-    private Integer buyQty;
+    private Integer quantity;
 
     // 售后中数量
     @Excel(name = "售后中数量")
@@ -107,11 +67,15 @@ public class OrderDetail extends BaseEntity {
 
     // 购买单价
     @Excel(name = "购买单价")
-    private BigDecimal buyPrice;
+    private BigDecimal price;
 
-    // 销方结算价
-    @Excel(name = "销方结算价")
-    private BigDecimal salePrice;
+    // 总金额
+    @Excel(name = "总金额")
+    private BigDecimal orderAmount;
+
+    // 支付金额
+    @Excel(name = "支付金额")
+    private BigDecimal payAmount;
 
     // 确认收货时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -123,11 +87,8 @@ public class OrderDetail extends BaseEntity {
     @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    // 订单明细状态
-    @Excel(name = "订单明细状态")
-    private String orderDetailStatus;
-
-    // 删除标志（0代表存在 2代表删除）
-    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
+    // 删除标志（0代表存在 1代表删除）
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,1=代表删除")
     private String delFlag;
+
 }

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/PaymentInfo/domain/PaymentInfo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -55,7 +56,7 @@ public class PaymentInfo extends BaseEntity {
 
     // 总金额
     @Excel(name = "总金额")
-    private Long amountTotal;
+    private BigDecimal amountTotal;
 
     // 用户标识
     @Excel(name = "用户标识")

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/ProdInventoryMapper.xml

@@ -19,22 +19,6 @@
         select prodInventoryId, prodId, prodAttrId, mercId, quantity, availQty, delFlag, createUser, createTime, updateUser, updateTime from t_prod_inventory
     </sql>
 
-    <sql id="selectProdInventoryExt">
-        select
-            ${tableAlias}.prodInventoryId,
-            ${tableAlias}.prodId,
-            ${tableAlias}.prodAttrId,
-            ${tableAlias}.mercId,
-            ${tableAlias}.quantity,
-            ${tableAlias}.availQty,
-            ${tableAlias}.delFlag,
-            ${tableAlias}.createUser,
-            ${tableAlias}.createTime,
-            ${tableAlias}.updateUser,
-            ${tableAlias}.updateTime
-        from t_prod_inventory ${tableAlias}
-    </sql>
-
     <select id="selectProdInventoryList" parameterType="ProdInventory" resultMap="ProdInventoryResult">
         <include refid="selectProdInventory"/>
         <where>