autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 18:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-g' into dev

Browse Source
This commit is contained in:
Guoqs
2025-03-12 17:00:40 +08:00
parent 39e66377e9 f471d35362
commit 2a5f29dc16
5 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/sh/app-prd.sh
View File

@@ -32,7 +32,9 @@ start(){
else else
# 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件 # 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件
# 注意：nohup 应该是 nohup 的拼写错误 # 注意：nohup 应该是 nohup 的拼写错误
echo "jsowell-admin.jar 正在启动..."
nohup java -Xms12g -Xmx12g -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=prd >/dev/null 2>&1 & nohup java -Xms12g -Xmx12g -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=prd >/dev/null 2>&1 &
echo "jsowell-admin.jar 启动完成..."
fi fi
} }
@@ -45,6 +47,7 @@ stop(){
kill -9 $pid kill -9 $pid
# 输出停止应用的提示信息 # 输出停止应用的提示信息
echo "Stopped ${APP_NAME} running on port $PORT." echo "Stopped ${APP_NAME} running on port $PORT."
echo "jsowell-admin.jar已停止..."
else else
# 如果应用没有运行，则输出提示信息 # 如果应用没有运行，则输出提示信息
echo "${APP_NAME} is not running on port $PORT." echo "${APP_NAME} is not running on port $PORT."

3
bin/sh/app-pre.sh
View File

@@ -32,7 +32,9 @@ start(){
else else
# 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件 # 如果应用没有运行，则启动应用，并将输出重定向到 nobup.log 文件
# 注意：nohup 应该是 nohup 的拼写错误 # 注意：nohup 应该是 nohup 的拼写错误
echo "jsowell-admin.jar 正在启动..."
nohup java -Xms512m -Xmx512m -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=pre >/dev/null 2>&1 & nohup java -Xms512m -Xmx512m -XX:+UseG1GC -jar /opt/app/spring/jar/jsowell-admin.jar --spring.profiles.active=pre >/dev/null 2>&1 &
echo "jsowell-admin.jar 启动完成..."
fi fi
} }
@@ -45,6 +47,7 @@ stop(){
kill -9 $pid kill -9 $pid
# 输出停止应用的提示信息 # 输出停止应用的提示信息
echo "Stopped ${APP_NAME} running on port $PORT." echo "Stopped ${APP_NAME} running on port $PORT."
echo "jsowell-admin.jar已停止..."
else else
# 如果应用没有运行，则输出提示信息 # 如果应用没有运行，则输出提示信息
echo "${APP_NAME} is not running on port $PORT." echo "${APP_NAME} is not running on port $PORT."

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java
View File

@@ -151,7 +151,7 @@ public class PileMerchantInfoController extends BaseController {
*/ */
@PreAuthorize("@ss.hasPermi('pile:merchant:edit')") @PreAuthorize("@ss.hasPermi('pile:merchant:edit')")
@Log(title = "修改提现方式", businessType = BusinessType.UPDATE) @Log(title = "修改提现方式", businessType = BusinessType.UPDATE)
@PutMapping("/updateWithdrawalType") @PostMapping("/updateWithdrawalType")
public AjaxResult updateWithdrawalType(@RequestBody MerchantWithdrawalTypeVO dto) { public AjaxResult updateWithdrawalType(@RequestBody MerchantWithdrawalTypeVO dto) {
return toAjax(pileMerchantInfoService.updateWithdrawalType(dto)); return toAjax(pileMerchantInfoService.updateWithdrawalType(dto));
} }

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -647,7 +647,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
if (pileMerchantInfo != null) { if (pileMerchantInfo != null) {
MerchantWithdrawalTypeVO merchantWithdrawalTypeVO = new MerchantWithdrawalTypeVO(); MerchantWithdrawalTypeVO merchantWithdrawalTypeVO = new MerchantWithdrawalTypeVO();
merchantWithdrawalTypeVO.setMerchantId(pileMerchantInfo.getId() + ""); merchantWithdrawalTypeVO.setMerchantId(pileMerchantInfo.getId() + "");
merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getDelayMode()); merchantWithdrawalTypeVO.setWithdrawalType(pileMerchantInfo.getWithdrawalType());
merchantWithdrawalTypeVO.setReservedAmount(pileMerchantInfo.getReservedAmount()); merchantWithdrawalTypeVO.setReservedAmount(pileMerchantInfo.getReservedAmount());
return merchantWithdrawalTypeVO; return merchantWithdrawalTypeVO;
} }
@@ -667,7 +667,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
} }
merchantInfo.setUpdateBy(SecurityUtils.getUsername()); merchantInfo.setUpdateBy(SecurityUtils.getUsername());
merchantInfo.setUpdateTime(DateUtils.getNowDate()); merchantInfo.setUpdateTime(DateUtils.getNowDate());
return pileMerchantInfoMapper.updatePileMerchantInfo(merchantInfo); return pileMerchantInfoMapper.updateByPrimaryKeySelective(merchantInfo);
} }
} }

22
jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
View File

@@ -835,7 +835,7 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<resultMap id="PileMerchantInfoResult" type="com.jsowell.pile.domain.PileMerchantInfo"> <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.PileMerchantInfo">
<result column="id" property="id" /> <result column="id" property="id" />
<result column="merchant_name" property="merchantName" /> <result column="merchant_name" property="merchantName" />
<result column="merchant_level" property="merchantLevel" /> <result column="merchant_level" property="merchantLevel" />
@@ -864,7 +864,7 @@
from pile_merchant_info from pile_merchant_info
</sql> </sql>
<select id="selectPileMerchantInfoList" parameterType="com.jsowell.pile.domain.PileMerchantInfo" resultMap="PileMerchantInfoResult"> <select id="selectPileMerchantInfoList" parameterType="com.jsowell.pile.domain.PileMerchantInfo" resultMap="BaseResultMap">
<include refid="selectPileMerchantInfoVo" /> <include refid="selectPileMerchantInfoVo" />
<where> <where>
del_flag = '0' del_flag = '0'
@@ -905,13 +905,13 @@
</where> </where>
</select> </select>
<select id="selectPileMerchantInfoById" parameterType="Long" resultMap="PileMerchantInfoResult"> <select id="selectPileMerchantInfoById" parameterType="Long" resultMap="BaseResultMap">
<include refid="selectPileMerchantInfoVo" /> <include refid="selectPileMerchantInfoVo" />
where id = #{id} where id = #{id}
</select> </select>
<select id="selectPileMerchantInfoListByIdList" resultMap="PileMerchantInfoResult"> <select id="selectPileMerchantInfoListByIdList" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from pile_merchant_info from pile_merchant_info
@@ -1125,7 +1125,7 @@
</foreach> </foreach>
</delete> </delete>
<select id="selectPileMerchantInfoByWxAppId" resultMap="PileMerchantInfoResult"> <select id="selectPileMerchantInfoByWxAppId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from pile_merchant_info from pile_merchant_info
@@ -1149,7 +1149,7 @@
</if> </if>
</select> </select>
<select id="queryInfoByDeptId" resultMap="PileMerchantInfoResult"> <select id="queryInfoByDeptId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from pile_merchant_info from pile_merchant_info
@@ -1157,7 +1157,7 @@
and dept_id = #{deptId,jdbcType=VARCHAR} and dept_id = #{deptId,jdbcType=VARCHAR}
</select> </select>
<select id="queryInfoListByIds" resultMap="PileMerchantInfoResult"> <select id="queryInfoListByIds" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from from
@@ -1171,7 +1171,7 @@
</if> </if>
</select> </select>
<select id="queryFirstLevelMerchantList" resultMap="PileMerchantInfoResult"> <select id="queryFirstLevelMerchantList" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from from
@@ -1180,7 +1180,7 @@
and merchant_level = '1' and merchant_level = '1'
</select> </select>
<select id="getFirstLevelMerchantByWxAppId" resultMap="PileMerchantInfoResult"> <select id="getFirstLevelMerchantByWxAppId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from from
@@ -1190,7 +1190,7 @@
and app_id = #{wxAppId,jdbcType=VARCHAR} and app_id = #{wxAppId,jdbcType=VARCHAR}
</select> </select>
<select id="getFirstLevelMerchantByAlipayAppId" resultMap="PileMerchantInfoResult"> <select id="getFirstLevelMerchantByAlipayAppId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from from
@@ -1248,7 +1248,7 @@
</if> </if>
</select> </select>
<select id="selectListByFirstMerchant" resultMap="PileMerchantInfoResult"> <select id="selectListByFirstMerchant" resultMap="BaseResultMap">
select <include refid="Base_Column_List" /> select <include refid="Base_Column_List" />
from pile_merchant_info from pile_merchant_info
where del_flag = '0' where del_flag = '0'