Merge branch 'feature-jingfeng' into 'master'

顺序

See merge request !1927

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/scan/ScanController.java

@@ -107,14 +107,14 @@ public class ScanController {
                 scanDetailVO.setCouponError("识别到多张兑换券，为防止核销错误，请协助会员，在会员小程序中进行兑换券核销");
                 scanDetailVO.setCouponErrorType(1);
             }else {
-                Integer verificationType = coupCardDTO.getVerificationType();
-                if (!Objects.equals(verificationType, 0)) {
-                    scanDetailVO.setCouponError("请通过收银台核销此兑换券");
-                }
                 boolean checkStore = coupCardDTO.isCheckStore();
                 if (!checkStore) {
                     scanDetailVO.setCouponError("兑换券在本店不可用");
                 }
+                Integer verificationType = coupCardDTO.getVerificationType();
+                if (!Objects.equals(verificationType, 0)) {
+                    scanDetailVO.setCouponError("请通过收银台核销此兑换券");
+                }
             }
             CoupCardVO cardVO = EntityUtil.changeEntityNew(CoupCardVO.class, coupCardDTO);
             if (Objects.equals(GlobalInfo.COUPON_STATUS_USED, coupCardDTO.getStatus())) {