Merge remote-tracking branch 'origin/master'
This commit is contained in:
hejiayang
+4
-4
@@ -483,8 +483,8 @@ public class StClientMemberBalanceController {
|
||||
}
|
||||
}
|
||||
query.setCanteenIdList(canteenIdList);
|
||||
query.setStatus(1);//消费=101
|
||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
||||
query.setStatus(101);
|
||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query);
|
||||
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
|
||||
|
||||
StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额
|
||||
@@ -523,8 +523,8 @@ public class StClientMemberBalanceController {
|
||||
}
|
||||
}
|
||||
query.setCanteenIdList(canteenIdList);
|
||||
query.setStatus(1);//消费=101
|
||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
||||
query.setStatus(101);
|
||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query);
|
||||
|
||||
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
|
||||
StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额
|
||||
|
||||
+4
-17
@@ -1,9 +1,12 @@
|
||||
package org.jeecg.payment.listUtils;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* * 订单编码码生成器，生成32位数字编码，
|
||||
@@ -107,26 +110,10 @@ public class OrderUtils {
|
||||
*/
|
||||
|
||||
public static String getOrderCodeV2() {
|
||||
return ORDER_CODE + getDateTimeV2();
|
||||
return getDateTime() + IdWorker.get32UUID();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生成退货单号编码（调用方法）
|
||||
* @param userId 网站中该用户唯一ID 防止重复
|
||||
*/
|
||||
public static String getReturnCode(Integer userId) {
|
||||
return RETURN_ORDER + getCode(userId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 生成退款单号编码(调用方法)
|
||||
* @param userId 网站中该用户唯一ID 防止重复
|
||||
*/
|
||||
public static String getRefundCode(Integer userId) {
|
||||
return REFUND_ORDER + getCode(userId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public interface StClientMemberTransactionRecordMapper extends BaseMapper<StClie
|
||||
|
||||
long pageListCount(@Param("vo") StClientMemberTransactionRecordDTO query);
|
||||
IPage<StClientMemberTransactionRecordVO> pageList2(Page<StClientMemberTransactionRecordVO> page, @Param("vo") StClientMemberTransactionRecordDTO query);
|
||||
|
||||
List<StClientMemberTransactionRecordVO> pageList2( @Param("vo") StClientMemberTransactionRecordDTO query);
|
||||
/**
|
||||
* 列表查询
|
||||
* @return
|
||||
|
||||
+2
-2
@@ -309,8 +309,8 @@
|
||||
) AS totalNum
|
||||
FROM
|
||||
st_bbzx_order_info oi
|
||||
JOIN sys_user_sub u ON oi.member_id = u.id
|
||||
JOIN sys_user_sub pay ON oi.pay_member_id = pay.id
|
||||
LEFT JOIN sys_user_sub u ON oi.member_id = u.id
|
||||
LEFT JOIN sys_user_sub pay ON oi.pay_member_id = pay.id
|
||||
LEFT JOIN st_base_restaurant AS sr ON sr.id = oi.canteen_id
|
||||
LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0'
|
||||
LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0'
|
||||
|
||||
+1
-1
@@ -200,7 +200,7 @@
|
||||
|
||||
</select>
|
||||
<select id="pageList2" resultType="org.jeecg.payment.vo.StClientMemberTransactionRecordVO">
|
||||
SELECT
|
||||
SELECT DISTINCT
|
||||
a.id,
|
||||
a.serial_no as serialNo,
|
||||
a.order_no as orderNo,
|
||||
|
||||
+8
@@ -34,6 +34,14 @@ public interface IStClientMemberTransactionRecordService extends JeecgService<St
|
||||
*/
|
||||
List<StClientMemberTransactionRecordVO> queryList(StClientMemberTransactionRecordDTO query);
|
||||
|
||||
/**
|
||||
* 列表查询导出
|
||||
*
|
||||
* @param query
|
||||
* @return
|
||||
*/
|
||||
List<StClientMemberTransactionRecordVO> queryListNew(StClientMemberTransactionRecordDTO query);
|
||||
|
||||
IPage<StClientMemberTransactionRecordVO> pageBalanceRefundList(Page<StClientMemberTransactionRecordVO> page, StClientMemberTransactionRecordDTO query);
|
||||
|
||||
InOutRecordInfoVo getOneInOutInfo(String recordId);
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.xkcoding.http.util.StringUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -752,7 +753,7 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl<StBbzxOrderInfo
|
||||
public StBbzxOrderInfo buildOrderInfoNew(Date dateTime,String restId,String dinnerType,String plateNumber,String userId,String memberName,String memberPhone,Integer deductionType,StClientMemberLevelDeductRuleVo levelDeductRuleVo , String remark,StRfidVo stRfidVo){
|
||||
StBbzxOrderInfo stBbzxOrderInfo = new StBbzxOrderInfo();
|
||||
stBbzxOrderInfo.setOrderType(3);
|
||||
String orderNo = OrderUtils.getOrderCode(10);
|
||||
String orderNo = OrderUtils.getOrderCodeV2();
|
||||
stBbzxOrderInfo.setOrderNo(orderNo);
|
||||
stBbzxOrderInfo.setSerialNo(stRfidVo.getCardCode());
|
||||
stBbzxOrderInfo.setDinnerType(dinnerType);
|
||||
@@ -815,7 +816,7 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl<StBbzxOrderInfo
|
||||
StBbzxOrderInfo stBbzxOrderInfo = new StBbzxOrderInfo();
|
||||
stBbzxOrderInfo.setDeviceCode(stRfidVo.getDeviceCode());
|
||||
stBbzxOrderInfo.setOrderType(3);
|
||||
String orderNo = OrderUtils.getOrderCode(10);
|
||||
String orderNo = OrderUtils.getOrderCodeV2();
|
||||
stBbzxOrderInfo.setOrderNo(orderNo);
|
||||
stBbzxOrderInfo.setSerialNo(miniMineBalanceVo.getCardCode());
|
||||
stBbzxOrderInfo.setDinnerType(dinnerType);
|
||||
|
||||
+19
@@ -144,6 +144,25 @@ public class StClientMemberTransactionRecordServiceImpl extends JeecgServiceImpl
|
||||
return pageList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<StClientMemberTransactionRecordVO> queryListNew(StClientMemberTransactionRecordDTO query) {
|
||||
List<StClientMemberTransactionRecordVO> pageList = baseMapper.pageList2(query);
|
||||
if (CollectionUtils.isNotEmpty(pageList)) {
|
||||
for (StClientMemberTransactionRecordVO model : pageList) {
|
||||
model.setStatusName(MemberTransactionTypeEnum.getName(model.getStatus()));
|
||||
model.setPaymentMethodName(MemberEnum.getXcxName(model.getPaymentMethod()));
|
||||
model.setUpdateStatusName(null != model.getUpdateStatus() && 1 == model.getUpdateStatus() ? "前端":"后台");
|
||||
if(null != model.getBusinessModel()&& 1 == model.getBusinessModel() ){
|
||||
model.setBusinessModelName("定值模式");//扣费类型（1：固定扣费，2：固定+补贴扣费，3：按量扣费，4:自定义金额）
|
||||
}
|
||||
if(null != model.getBusinessModel()&& 4 == model.getBusinessModel() ){
|
||||
model.setBusinessModelName("金额模式");//扣费类型（1：固定扣费，2：固定+补贴扣费，3：按量扣费，4:自定义金额）
|
||||
}
|
||||
}
|
||||
}
|
||||
return pageList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPage<StClientMemberTransactionRecordVO> pageBalanceRefundList(Page<StClientMemberTransactionRecordVO> page,StClientMemberTransactionRecordDTO query) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user