|
@@ -78,7 +78,7 @@ public class ErrFillBusiness {
|
78
|
78
|
PtMealTypeVo mealTypeVo = list.get(4) == null ? new PtMealTypeVo() : (PtMealTypeVo) list.get(4);
|
79
|
79
|
|
80
|
80
|
log.info("[验证通过,开始写入消费明细数据]-[{}]", JSONUtil.toJsonStr(bo));
|
81
|
|
- String remark = MessageFormat.format("[错误补款]-[{0}]", JSONUtil.toJsonStr(bo));
|
|
81
|
+ String remark = MessageFormat.format("[错扣补款]-[{0}]", JSONUtil.toJsonStr(bo));
|
82
|
82
|
XfConsumeDetailVo consumeDetailVo = createConsumeRecord(bo, userAccountVo, cardVo, bagVo, termVo, mealTypeVo,remark);
|
83
|
83
|
if (consumeDetailVo == null) {
|
84
|
84
|
message = MessageFormat.format("[错扣补款]->[写消费明细表失败]-[{0}]", JSONUtil.toJsonStr(bo));
|
|
@@ -148,6 +148,10 @@ public class ErrFillBusiness {
|
148
|
148
|
consumeDetailBo.setMealName(mealTypeVo.getMealName());
|
149
|
149
|
//设置钱包信息
|
150
|
150
|
consumeDetailBo.setBagType(bagVo.getBagCode());
|
|
151
|
+ //错扣补款设置statusFlag为0
|
|
152
|
+ consumeDetailBo.setStatusFlag(0L);
|
|
153
|
+ //将需要补款的消费记录Id记入原始消费Id,以便追查消费记录是否有补扣以及对应的补扣记录
|
|
154
|
+ consumeDetailBo.setOriginalId(bo.getConsumeId());
|
151
|
155
|
consumeDetailBo.setRemark(remark);
|
152
|
156
|
|
153
|
157
|
return consumeDetailService.createConsumeDetailRecord(consumeDetailBo);
|
|
@@ -162,10 +166,11 @@ public class ErrFillBusiness {
|
162
|
166
|
*/
|
163
|
167
|
private XfUserTotalVo createOrUpdateUserTotal(ConsumptionBo bo, PtUserAccountVo accountVo, PtCardVo cardVo) {
|
164
|
168
|
XfUserTotalBo xfUserTotalBo = new XfUserTotalBo();
|
165
|
|
- xfUserTotalBo.setUserId(accountVo.getUserId());
|
166
|
|
- xfUserTotalBo.setUserNumb(accountVo.getUserNumb());
|
167
|
|
- xfUserTotalBo.setRealName(accountVo.getRealName());
|
168
|
|
- xfUserTotalBo.setDeptName(accountVo.getDeptName());
|
|
169
|
+ BeanUtil.copyProperties(accountVo, xfUserTotalBo);
|
|
170
|
+ //xfUserTotalBo.setUserId(accountVo.getUserId());
|
|
171
|
+ //xfUserTotalBo.setUserNumb(accountVo.getUserNumb());
|
|
172
|
+ //xfUserTotalBo.setRealName(accountVo.getRealName());
|
|
173
|
+ //xfUserTotalBo.setDeptName(accountVo.getDeptName());
|
169
|
174
|
xfUserTotalBo.setCardNo(cardVo.getCardNo());
|
170
|
175
|
xfUserTotalBo.setDateDay(DateUtil.format(new Date(), "yyyy-MM-dd"));
|
171
|
176
|
xfUserTotalBo.setUseType(bo.getUseType().code());
|