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

查询额外订单收入

Browse Source
This commit is contained in:
Guoqs
2025-01-24 14:33:07 +08:00
parent 26ee67c9b9
commit 74543bbdd9
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
View File

@@ -28,4 +28,8 @@ public interface OrderSplitRecordMapper {
@Param("stationId") String stationId,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
List<OrderSplitRecord> queryOrderSplitRecordList(@Param("adapayMemberId") String adapayMemberId,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
}

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

@@ -16,6 +16,7 @@ import com.jsowell.pile.mapper.OrderSplitRecordMapper;
import com.jsowell.pile.service.AdapayMemberAccountService;
import com.jsowell.pile.service.OrderSplitRecordService;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import com.jsowell.pile.vo.web.ExtraOrderIncomeVO;
import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
import com.jsowell.pile.vo.web.OrderSplitRecordVO;
import com.jsowell.pile.vo.web.OtherSplitDetail;
@@ -231,9 +232,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
* 根据merchantId, 查询从他人分账的金额
* extra income
*/
public BigDecimal queryExtraIncome(String merchantId) {
public ExtraOrderIncomeVO queryExtraIncome(String merchantId, String startTime, String endTime) {
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
List<OrderSplitRecord> orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, null, null, null);
List<OrderSplitRecord> orderSplitRecords = orderSplitRecordMapper.queryOrderSplitRecordList(adapayMemberAccount.getAdapayMemberId(), startTime, endTime);
BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总
Map<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap();// 当天其他人分账的记录
return null;

9
jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
View File

@@ -770,4 +770,13 @@
</if>
and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
</select>
<select id="queryOrderSplitRecordList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from order_split_record
where del_flag = '0'
and adapay_member_id = #{adapayMemberId,jdbcType=VARCHAR}
and trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
</select>
</mapper>