java/HongRuiTang.git

			@@ -156,7 +156,7 @@
			// 是否需要保存response，参数和值
			if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
			{
			operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 1000));
			operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 5000));
			}
			}

			@@ -1612,7 +1612,7 @@
			// TODO 活动才分账
			if (order.getOrderFrom() == 2) {
			// 活动才分账
			submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOrderMoney());
			submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOnlinePayMoney());
			}

			//创建支付记录
			@@ -2665,8 +2665,10 @@
			// 遍历列表，设置店铺名称、用户名称和未支付金额
			for (MgtShopOrderPageVo mgtShopOrderPageVo : shopOrderPageVoList) {
			if (shopMap != null && !shopMap.isEmpty()) {
			if(shopMap.get(mgtShopOrderPageVo.getShopId())!=null){
			mgtShopOrderPageVo.setShopName(shopMap.get(mgtShopOrderPageVo.getShopId()).getShopName());
			}
			}
			if (userMap != null && !userMap.isEmpty()) {
			if (userMap.get(mgtShopOrderPageVo.getUserId()) != null) {
			mgtShopOrderPageVo.setNickName(userMap.get(mgtShopOrderPageVo.getUserId()).getNickName());

			@@ -346,7 +346,7 @@
			toc.change_receivable_money - (CASE toc.pay_type WHEN 1 THEN toc.pay_money WHEN 2 THEN IFNULL(toc.offline_pay_money,0) END) unPaidMoney,
			toc.create_time createTime
			FROM t_order toc
			WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND toc.order_status >= 2 AND toc.close_flag = 0
			WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND toc.order_status = 3 AND toc.close_flag = 0
			ORDER BY toc.create_time DESC
			</select>

	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史