czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-08-29 15:49:39 +08:00
parent c9b3cea5cd 08a9a26f2d
commit 12b87312fd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@@ -749,6 +749,10 @@ public class MemberService {
return Result.fail(CodeEnum.USERSHOPFLOWNOEXIST); return Result.fail(CodeEnum.USERSHOPFLOWNOEXIST);
} }
if(!"0".equals(flow.getIsReturn())){
return Result.fail(CodeEnum.ORDERRETURN);
}
TbShopUser user=tbShopUserMapper.selectByPrimaryKey(flow.getShopUserId()); TbShopUser user=tbShopUserMapper.selectByPrimaryKey(flow.getShopUserId());
@@ -776,7 +780,7 @@ public class MemberService {
String no=DateUtils.getSsdfTimes(); String no=DateUtils.getSsdfTimes();
PublicResp<OrderReturnResp> publicResp = thirdPayService.returnOrder(url, thirdApply.getAppId(),no , flow.getRemark(), null, "充值退款", flow.getAmount().setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), callBack, null, thirdApply.getAppToken()); PublicResp<OrderReturnResp> publicResp = thirdPayService.returnOrder(url, thirdApply.getAppId(),no , null, flow.getRemark(), "充值退款", flow.getAmount().setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), callBack, null, thirdApply.getAppToken());
if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) { if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
if ("000000".equals(publicResp.getCode())) { if ("000000".equals(publicResp.getCode())) {
if (!"SUCCESS".equals(publicResp.getObjData().getState()) && !publicResp.getObjData().getState().equals("ING")) { if (!"SUCCESS".equals(publicResp.getObjData().getState()) && !publicResp.getObjData().getState().equals("ING")) {

1
src/main/resources/mapper/TbShopUserFlowMapper.xml
View File

@@ -126,6 +126,7 @@
biz_name = #{bizName,jdbcType=VARCHAR}, biz_name = #{bizName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
type = #{type,jdbcType=VARCHAR} type = #{type,jdbcType=VARCHAR}
is_return=#{isReturn,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>