APP升级，退运和退单的字段增加

sp-generate/src/main/java/com/pj/SpGenerateApplication.java

@@ -23,7 +23,7 @@ public class SpGenerateApplication {
 		// ===================================  设置连接信息  ===================================
         FlyConfig config = new FlyConfig();
         config.setDriverClassName("com.mysql.cj.jdbc.Driver");
-        config.setUrl("jdbc:mysql://106.15.1.216:3006/pay-system?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC");
+        config.setUrl("jdbc:mysql://106.15.1.216:3006/sp-admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC");
         config.setUsername("yun_user");
         config.setPassword("yun_Root@1123");
         config.setPrintSql(true);		// 是否打印sql
@@ -37,8 +37,8 @@ public class SpGenerateApplication {
 
 		// ===================================  一些全局设置  ===================================
 		GenCfgManager.cfg
-			.setProjectPath("D:/project/")	// 总项目地址 (生成代码的路径)
-	        .setServerProjectName("market-server/sp-service/payment-server")				// 服务端 - 项目名称
+			.setProjectPath("E:/projects/hs/")	// 总项目地址 (生成代码的路径)
+	        .setServerProjectName("market-server/sp-service/sp-admin")				// 服务端 - 项目名称
 //	        .setServerProjectName("sp-com/sp-core")			// 服务端 - 项目名称 (sp-com多模块版填此格式)
 	        .setCodePath("src/main/java/")					// 服务端代码 - 存放路径
 	        .setPackagePath( "com.pj")				// 服务端代码 - 总包名
@@ -64,7 +64,7 @@ public class SpGenerateApplication {
 			.setOutFC(false)					// 是否输出FC.java工厂类
 			.setDefaultMeunIcon("el-icon-folder-opened")	// 生成后台管理页面时，默认的菜单图标
 			.setWebLibImportWay(2) 			// 前端js库导入方式(1=cdn导入, 2=本地导入[需将sa-admin附带js包复制到kj文件夹])
-			 .addTableName("bank_info_charges")	// 添加要生成的表 (单个添加)
+			 .addTableName("tb_app")	// 添加要生成的表 (单个添加)
 //			.addTableAll()		// 添加要生成的表 (一次性添加所有表)
 //          .removeTableName("sp_role", "sp_role_permission", "sp_admin", "sp_apilog", "sp_cfg")	// 移除这些内置的表，不必生成代码
             ;

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlement.java

@@ -253,6 +253,25 @@ public class HtTradeSettlement extends Model<HtTradeSettlement> implements Seria
 	private Integer orderCount;
 	private Integer onSaleCount;
 	private Integer beOrderCount;
+	/**
+	 * 退运状态0正常 1 退运
+	 */
+	private Integer returns;
+	/**
+	 * 退运时间
+	 */
+	private Date returnsTime;
+	/**
+	 * 退单 0正常 1 退运
+	 */
+	private Integer chargebacks;
+	/**
+	 * 退单时间
+	 */
+	private Date chargebacksTime;
+
+
+
 
 	@TableField(exist = false)
 	private String sumUpPrice;

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -538,4 +538,21 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 
     private BigDecimal upPrice;
 
+	/**
+	 * 退运状态0正常 1 退运
+	 */
+	private Integer returns;
+	/**
+	 * 退运时间
+	 */
+	private Date returnsTime;
+	/**
+	 * 退单 0正常 1 退运
+	 */
+	private Integer chargebacks;
+	/**
+	 * 退单时间
+	 */
+	private Date chargebacksTime;
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -617,8 +617,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         List<TbOrder> orderList = findByBuyUserId(appLoginInfo.getFk());
         OrderVo orderVo = new OrderVo();
         //被委托订单,并且三个状态中有一个未确认
-        List<TbOrder> declareList2 = orderList.stream().filter(item -> !"1".equals(item.getDeclareType()) &&
-                (item.getPeopleConfirmStatus() == 0 || item.getCooperEntrustStatus() == 0 || item.getApplyConfirmStatus() == 0)).collect(Collectors.toList());
+        List<TbOrder> declareList2 = orderList.stream().filter(item ->item.getApplyConfirmStatus() == 0).collect(Collectors.toList());
         if (declareList2.size() > 0) {
             if (1 == cooper_entrust) {
                 List<Long> removeList = new ArrayList<>();

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/AppApkController.java

@@ -0,0 +1,24 @@
+package com.pj.project.tb_app;
+
+import com.pj.utils.sg.AjaxJson;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("app")
+public class AppApkController {
+    @Resource
+    private TbAppService appService;
+
+    @GetMapping("updateInfo")
+    public AjaxJson updateInfo() {
+        TbApp app = appService.findUpApk();
+        return AjaxJson.getSuccessData(app);
+    }
+}

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/TbApp.java

@@ -0,0 +1,86 @@
+package com.pj.project.tb_app;
+
+import java.io.Serializable;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_app -- APK管理
+ * @author lbl 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbApp.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbApp extends Model<TbApp> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_app";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-app";
+	public static final String PERMISSION_CODE_ADD = "tb-app-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-app-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-app-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 *  
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 *  
+	 */
+	private String content;	
+
+	/**
+	 *  
+	 */
+	private String version;	
+
+	/**
+	 *  
+	 */
+	private String url;	
+
+	/**
+	 * 状态(0=下架,1=上架) 
+	 */
+	private Integer status;
+
+	/**
+	 * 创建时间 
+	 */
+	private Date createTime;	
+
+	/**
+	 * 更新时间 
+	 */
+	private Date updateTime;	
+
+
+
+
+
+	
+
+
+}

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/TbAppController.java

@@ -0,0 +1,93 @@
+package com.pj.project.tb_app;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_app -- APK管理
+ * @author lbl 
+ */
+@RestController
+@RequestMapping("/TbApp/")
+public class TbAppController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbAppService tbAppService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbApp.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbApp t){
+		tbAppService.add(t);
+		t = tbAppService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbApp.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbAppService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbApp.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbApp.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbApp.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbApp t){
+		tbAppService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbApp.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbApp t = tbAppService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbApp.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbApp> list = tbAppService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	/** 改 - 状态(0=下架,1=上架) */  
+	@RequestMapping("updateStatus")
+	@SaCheckPermission(TbApp.PERMISSION_CODE_EDIT)
+	public AjaxJson updateStatus(Long id, Integer value){
+		int line =tbAppService.updateStatus(id, value);
+		return AjaxJson.getByLine(line);
+	}
+	
+	
+
+	
+	
+	
+
+}

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/TbAppMapper.java

@@ -0,0 +1,31 @@
+package com.pj.project.tb_app;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_app -- APK管理
+ * @author lbl 
+ */
+
+@Mapper
+@Repository
+public interface TbAppMapper extends BaseMapper <TbApp> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbApp> getList(SoMap so);
+
+
+
+}

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/TbAppMapper.xml

@@ -0,0 +1,53 @@
+<?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.pj.project.tb_app.TbAppMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, content, version, url, status, create_time, update_time from tb_app  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.project.tb_app.TbApp"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_app 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("content") '> and content = #{content} </if>
+			<if test=' this.has("version") '> and version = #{version} </if>
+			<if test=' this.has("url") '> and url = #{url} </if>
+			<if test=' this.has("status") '> and status = #{status} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> content desc </when>
+			<when test='sortType == 3'> version desc </when>
+			<when test='sortType == 4'> url desc </when>
+			<when test='sortType == 5'> status desc </when>
+			<when test='sortType == 6'> create_time desc </when>
+			<when test='sortType == 7'> update_time desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/sp-admin/src/main/java/com/pj/project/tb_app/TbAppService.java

@@ -0,0 +1,85 @@
+package com.pj.project.tb_app;
+
+import java.util.Date;
+import java.util.List;
+
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Service: tb_app -- APK管理
+ *
+ * @author lbl
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbAppService extends ServiceImpl<TbAppMapper, TbApp> implements IService<TbApp> {
+
+    /**
+     * 底层 Mapper 对象
+     */
+    @Autowired
+    TbAppMapper tbAppMapper;
+
+    /**
+     * 增
+     */
+    void add(TbApp t) {
+        t.setCreateTime(new Date());
+        save(t);
+    }
+
+    /**
+     * 删
+     */
+    void delete(Long id) {
+        removeById(id);
+    }
+
+    /**
+     * 改
+     */
+    void update(TbApp t) {
+        updateById(t);
+
+    }
+
+    /**
+     * 查
+     */
+    TbApp getById(Long id) {
+        return super.getById(id);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    List<TbApp> getList(SoMap so) {
+        return tbAppMapper.getList(so);
+    }
+
+
+    public int updateStatus(Long id, Integer status) {
+        TbApp app = super.getById(id);
+        if (app == null) {
+            return 0;
+        }
+        app.setStatus(status);
+        app.setUpdateTime(new Date());
+        return super.updateById(app) ? 1 : 0;
+    }
+
+    public TbApp findUpApk() {
+        SoMap so = new SoMap();
+        so.put("status", 1);
+        List<TbApp> list = getList(so);
+        if (list!= null && list.size() > 0) {
+            return list.get(0);
+        }
+        return null;
+    }
+}

sp-service/sp-admin/src/main/java/com/pj/project4sp/uploadfile/UploadController.java

@@ -61,7 +61,7 @@ public class UploadController {
 	public AjaxJson file(MultipartFile file){
 		// 验证文件大小 -> 验证后缀 -> 保存到硬盘 -> 地址返回给前端
 		UploadUtil.checkFileSize(file);
-		UploadUtil.checkSubffix(file.getOriginalFilename(), UploadUtil.uploadConfig.fileSuffix);
+		UploadUtil.checkSubffix(file.getOriginalFilename(), UploadUtil.uploadConfig.apkSuffix);
 		String httpUrl = UploadUtil.saveFile(file, UploadUtil.uploadConfig.fileFolder);
 		return AjaxJson.getSuccessData(httpUrl);
 	}