|
|
@@ -325,7 +325,7 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
|
|
|
public Boolean scanCodeVerification(List<String> isinIds) {
|
|
|
|
|
|
LoginUser loginUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
|
|
-
|
|
|
+ boolean sable= true;
|
|
|
for (String isinId : isinIds) {
|
|
|
//查询对应券号
|
|
|
AppIsin appIsin = appIsinMapper.selectById(isinId);
|
|
|
@@ -348,7 +348,7 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
|
|
|
AppOrder appOrder = appOrderMapper.selectById(orderId);
|
|
|
int x = appIsinMapper.selectList(Wrappers.<AppIsin>lambdaQuery().eq(AppIsin::getOrderId, appOrder.getId()).eq(AppIsin::getIsinStatus, 0)).size();
|
|
|
int y = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, appOrder.getId()).eq(AppOrderProInfo::getOrderStatus, 0)).size();
|
|
|
- if (ObjectUtil.isNotEmpty(appOrder) && x == 0 && y == 0){
|
|
|
+ if (ObjectUtil.isNotEmpty(appOrder) && x == 1 && y == 0){
|
|
|
if(!Objects.equals(appOrder.getOrderStatus(), CommonConstant.ORDER_STATUS_2)){
|
|
|
appOrder.setOrderStatus(CommonConstant.ORDER_STATUS_2);
|
|
|
appOrderMapper.updateById(appOrder);
|