Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -242,6 +242,7 @@ public class PayController {
                               ){
 
 
+
         return payService.returnOrder(list,token,pwd, isOnline);
     }
 

src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java

@@ -273,6 +273,12 @@ public class DataService {
 
 
 
+                        JSONObject config = JSONObject.parseObject(it.getConfig());
+                        String model = config.getString("model");
+                        if(!"normal".equals(model)){
+                            log.error("打印机类型错误");
+                            return;
+                        }
                         List<HandoverInfo.PayInfo> list = null;
                         List<HandoverInfo.MemberData> memberData = null;
                         List<HandoverInfo.ProductCategory> productCategories = null;