修复支付接口

kxs-common/kxs-common-pay/src/main/java/com/kxs/common/pay/service/yue/YuePayService.java

@@ -32,7 +32,7 @@ public class YuePayService implements PayService {
 
         PayRequestDTO payRequestDTO = new PayRequestDTO();
         BeanUtil.copyProperties(payReq, payRequestDTO);
-        R result = remoteYuePayService.yuePay(payRequestDTO);
+        R result = remoteYuePayService.yuePay(payRequestDTO, SecurityConstants.FROM_IN);
         if (result.getStatus() != 1) {
             throw new GlobalCustomerException(result.getMsg());
         }

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/feign/RemoteYuePayService.java

@@ -19,7 +19,7 @@ public interface RemoteYuePayService {
 	 * 余额支付
 	 */
 	@PostExchange("/userAccount/yuePay")
-	R yuePay(@RequestBody PayRequestDTO payReq);
+	R yuePay(@RequestBody PayRequestDTO payReq, @RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 余额退款

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/vo/kxsapp/userAccount/UserAmountVariationListVO.java

@@ -43,6 +43,12 @@ public class UserAmountVariationListVO implements Serializable {
     @Schema(description = "操作金额")
     private BigDecimal amount;
 
+    /**
+     *  操作金额类型 add新增 sub减少
+     */
+    @Schema(description = "操作金额")
+    private String kind;
+
 
     /**
      * 金额类型

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserAmountLogMapper.xml

@@ -26,7 +26,7 @@
         CREATE  TABLE IF NOT EXISTS `${tableName}` LIKE kxs_user_amount_log;
     </update>
     <select id="getByPage" resultType="com.kxs.user.api.vo.kxsapp.userAccount.UserAmountVariationListVO">
-        SELECT *, c.name as variation_type_name,u.user_code as source_user
+        SELECT *, c.name as variation_type_name,u.user_code as source_user, a.kind
         FROM  ${tableName} a
         left join kxs_change_type_kind c on c.id = a.variation_type
         left join kxs_user u on u.id = a.variation_cause