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

update 后管订单详情页查询退款信息

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-15 14:25:51 +08:00
parent cadfa31c98
commit 2fe34b5bf7
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -437,13 +437,20 @@ public class OrderService {
*/
private List<OrderDetailInfoVO.OrderRefundInfo> getOrderRefundInfoList(OrderBasicInfo orderBasicInfo) {
List<OrderDetailInfoVO.OrderRefundInfo> orderRefundInfoList = Lists.newArrayList();
OrderDetailInfoVO.OrderRefundInfo refundInfo;
if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 查新member_wallet_log订单退款记录
// memberWalletLogService.
// 查新member_wallet_log订单 进账记录
MemberWalletLog memberWalletLog = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue());
if (memberWalletLog != null) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString());
refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime()));
orderRefundInfoList.add(refundInfo);
}
} else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) {
List<PaymentReverseResponse> paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo);
if (CollectionUtils.isNotEmpty(paymentReverseResponses)) {
OrderDetailInfoVO.OrderRefundInfo refundInfo;
for (PaymentReverseResponse reverseResponse : paymentReverseResponses) {
refundInfo = new OrderDetailInfoVO.OrderRefundInfo();
refundInfo.setReverseId(reverseResponse.getId());

8
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -36,10 +36,10 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_dev
# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_prd_copy
#url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: jsowell_dev
url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_prd_copy
password: 123456
# 从库数据源
slave:

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
View File

@@ -82,4 +82,6 @@ public interface MemberWalletLogMapper {
* @return
*/
List<MemberBalanceVO> getMemberRefundAmount(List<String> memberIds);
MemberWalletLog getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type);
}

1
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletLogService.java
View File

@@ -15,4 +15,5 @@ public interface IMemberWalletLogService {
int updateByPrimaryKey(MemberWalletLog record);
MemberWalletLog getOrderRecord(String orderCode, String type);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java
View File

@@ -43,4 +43,9 @@ public class MemberWalletLogServiceImpl implements IMemberWalletLogService {
return memberWalletLogMapper.updateByPrimaryKey(record);
}
@Override
public MemberWalletLog getOrderRecord(String orderCode, String type) {
return memberWalletLogMapper.getOrderRecord(orderCode, type);
}
}

8
jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml
View File

@@ -202,4 +202,12 @@
</foreach>
</if>
</select>
<select id="getOrderRecord" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from member_wallet_log
where related_order_code = #{orderCode,jdbcType=VARCHAR}
and type = #{type,jdbcType=VARCHAR}
</select>
</mapper>