3.18增加消费的地区查询并增加记录ERP传入的type

src/main/java/com/example/demo/domain/entity/DetailY.java

@@ -51,6 +51,7 @@ public class DetailY implements Serializable {
     private String auditReson;
     private String orderCode;
     private Integer refundFlag;
+    private Integer gtype;
 
     private List<Integer> updateTypes;
 
@@ -78,4 +79,7 @@ public class DetailY implements Serializable {
     private String sortOrder;
 
     private String num;
+
+    private List<String> areas;
+
 }

src/main/java/com/example/demo/domain/vo/RechargeVo.java

@@ -44,6 +44,7 @@ public class RechargeVo {
     private String orderCode;
 
     private String adminName;
+
     private String sortField;
     private String sortOrder;
 

src/main/java/com/example/demo/domain/vo/SumConsume.java

@@ -22,4 +22,5 @@ public class SumConsume {
     private Date startDate;
     private Date endDate;
     private String token;
+    private String area;
 }

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -60,6 +60,7 @@ public interface ConsumeMapper {
             "<if test='consumePlatform!=null and consumePlatform.length>0'>and detail_y.consume_platform=#{consumePlatform}</if>",
             "<if test='consumeType!=null and consumeType.length>0'>and detail_y.consume_type= #{consumeType}</if>",
             "<if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "<if test='area!=null and area.length>0'>and area=#{area}</if>",
             "</where>",
 
             "<choose>",

src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java

@@ -192,6 +192,7 @@ public class OtherServiceImpl implements OtherService {
             detailY.setTaskCoin(taskJb);
             detailY.setRemark(remark);
             detailY.setName(adminName);
+            detailY.setGtype(Integer.valueOf(type));
 //            detailY.setUsername(username);
 //            detailY.setArea(area);
             detailY.setProductName(productName);
@@ -244,6 +245,7 @@ public class OtherServiceImpl implements OtherService {
             System.out.println("消费------------------------------------------------------");
             detailY.setUpdateType(1);  // 设置 updateType 为 1
             detailY.setJwcode(JwCode);
+            detailY.setGtype(Integer.valueOf(type));
             detailY.setRechargeCoin(rechargeJb);
             detailY.setFreeCoin(freeJb);
             detailY.setTaskCoin(taskJb);
@@ -288,6 +290,7 @@ public class OtherServiceImpl implements OtherService {
             System.out.println("退款------------------------------------------------------");
             detailY.setUpdateType(2);  // 设置 updateType 为 2
             detailY.setJwcode(JwCode);
+            detailY.setGtype(Integer.valueOf(type));
             detailY.setRechargeCoin(rechargeJb);
             detailY.setFreeCoin(freeJb);
             detailY.setTaskCoin(taskJb);
@@ -332,6 +335,7 @@ public class OtherServiceImpl implements OtherService {
             System.out.println("其他------------------------------------------------------");
             detailY.setUpdateType(3);  // 设置 updateType 为 3
             detailY.setJwcode(JwCode);
+            detailY.setGtype(Integer.valueOf(type));
             detailY.setRechargeCoin(rechargeJb);
             detailY.setFreeCoin(freeJb);
             detailY.setTaskCoin(taskJb);

src/main/resources/mapper/ConsumeMapper.xml

@@ -18,6 +18,7 @@
             <if test='consumePlatform!=null and consumePlatform.length>0'>and detail_y.consume_platform=#{consumePlatform}</if>
             <if test='consumeType!=null and consumeType.length>0'>and detail_y.consume_type= #{consumeType}</if>
             <if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>
+            <if test='area!=null and area.length>0'>and area=#{area}</if>
             </where>
     </select>
 </mapper>

src/main/resources/mapper/DetailYMapper.xml

@@ -97,6 +97,12 @@
             <if test="area != null and area.length > 0">
                 AND area = #{area}
             </if>
+<!--            <if test="areas != null">-->
+<!--                AND area IN-->
+<!--                <foreach collection="areas" item="areas" open="(" separator="," close=")">-->
+<!--                    #{areas}-->
+<!--                </foreach>-->
+<!--            </if>-->
         </where>
         <choose>
             <!-- 优先使用前端传入的排序参数 -->