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

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -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订单退款记录
+            // 查新member_wallet_log订单 进账记录
-            // memberWalletLogService.
+            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());

jsowell-admin/src/main/resources/application-dev.yml

@@ -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
+        #url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jsowell_dev
+        #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
+        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
+        username: jsowell_prd_copy
         password: 123456
       # 从库数据源
       slave:

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java

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

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletLogService.java

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

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

@@ -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);
+    }
+
 }

jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml

@@ -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>