修改

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class AppUserInfoController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(AppUserInfoController.class);
     @Autowired

YijiaRestful/src/main/java/com/platform/yijia/controller/CustomerGradeController.java

@@ -25,6 +25,7 @@ import java.util.Map;
  */
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class CustomerGradeController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(CustomerGradeController.class);
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -34,6 +34,7 @@ import java.util.*;
  */
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class ElectronicMembershipCardController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(ElectronicMembershipCardController.class);
 
@@ -497,6 +498,7 @@ public class ElectronicMembershipCardController {
                                 break;
                             case "2":   //POS机打印
                                 payOrder.setIntegral(String.valueOf(integral));
+                                payOrder.setPrintSetting(stationInfos.getPrintSetting());
                                 this.posPrintReceipt(payOrder);
                                 break;
                         }
@@ -504,17 +506,13 @@ public class ElectronicMembershipCardController {
                 }else {
                     resultData=ResultData.error(CodeMsg.BALANCE_NOT_EENOUGH);
                 }
-            }
-            else {
+            }else {
                 resultData=ResultData.error(CodeMsg.NO_ORDER);
             }
+        }else{
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }
-        if(resultData !=null) {
-            return gson.toJson(resultData);
-        }else {
-            resultData = ResultData.error(CodeMsg.SELECT_ORDER_ERROR);
-            return gson.toJson(resultData);
-        }
+        return gson.toJson(resultData);
     }
 
     //POS机打印小票
@@ -586,10 +584,11 @@ public class ElectronicMembershipCardController {
         if(infoMap !=null && infoMap.containsKey("stationId") && infoMap.get("stationId") !=null){
             m.put("stationId", infoMap.get("stationId").toString());
         }
-        if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
-            m.put("orderType", infoMap.get("orderType").toString());
-        }
 
+//        if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
+//            m.put("orderType", infoMap.get("orderType").toString());
+//        }
+        m.put("orderType", "oil");
         logger.info("要推送的订单的信息：" +m.toString());
         //定义推送格式
         Map<String, Object> params = new HashMap<>();
@@ -605,6 +604,7 @@ public class ElectronicMembershipCardController {
             params.put("posFanoutExchange", stationDeviceManagerInfo.getPosFanoutExchange());
             params.put("posQueue", stationDeviceManagerInfo.getPosQueue());
             params.put("tusn", stationDeviceManagerInfo.getDeviceNo());
+            params.put("printSetting", payOrder.getPrintSetting()); //小票打印方式
         }
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(m);
@@ -656,7 +656,7 @@ public class ElectronicMembershipCardController {
         if(infoMap.containsKey("oilName") && infoMap.get("oilName") !=null ){
             oilNameP =infoMap.get("oilName").toString();
         }
-        if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")) {
+        if(!infoMap.containsKey("orderType") && infoMap.get("orderType").equals("3")) {
             //加油升数
             if (infoMap.containsKey("orderLiters") && infoMap.get("orderLiters") != null) {
                 orderLitersP = infoMap.get("orderLiters") + "";
@@ -668,7 +668,7 @@ public class ElectronicMembershipCardController {
             if(infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null ){
                 discountAmtP =infoMap.get("discountAmt")+"";
             }
-        }else if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("2")) {
+        }else{
             orderLitersP ="0.00";
             oilPirceP = "0.00";
             discountAmtP ="0.00";
@@ -699,13 +699,13 @@ public class ElectronicMembershipCardController {
         content1 += "订单号："+orderNoP+"  <BR>";
         content1 += "时间："+createdDateP+" <BR>";
         content1 += "油站："+stationNameP+"  <BR>";
-        if(infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("1")){
+        if(!infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("3")){
             content1 += "油品： "+oilNameP+"  <BR>";
             content1 += "油量： "+orderLitersP+"  升<BR>";
             content1 += "单价： "+oilPirceP+" L/元<BR>";
         }
         content1 += "<BOLD><B>原价： "+receivableAmtP+" 元</B></BOLD><BR>";
-        if(infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("1")){
+        if(!infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("3")){
             content1 += "优惠： "+discountAmtP+" 元<BR>";
         }
         content1 += "支付： "+amtP+" 元<BR>";
@@ -718,13 +718,13 @@ public class ElectronicMembershipCardController {
         content2 += "订单号："+orderNoP+" <BR>";
         content2 += "时间："+createdDateP+"<BR>";
         content2 += "油站："+stationNameP+" <BR>";
-        if(infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("1")){
+        if(!infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("3")){
             content2 += "油品： "+oilNameP+" <BR>";
             content2 += "油量： "+orderLitersP+" 升<BR>";
             content2 += "单价： "+oilPirceP+" L/元<BR>";
         }
         content2 += "<BOLD><B>原价： "+receivableAmtP+" 元</B></BOLD><BR>";
-        if(infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("1")){
+        if(!infoMap.containsKey("orderType") && infoMap.get("orderType").toString().equals("3")){
             content2 += "优惠： "+discountAmtP+" 元<BR>";
         }
         content2 += "支付： "+amtP+" 元<BR>";

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -33,6 +33,7 @@ import java.util.*;
  */
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class IntegralShoppingMallController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(IntegralShoppingMallController.class);
     @Resource
@@ -265,49 +266,72 @@ public class IntegralShoppingMallController {
                             //获取油站功能信息
                             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
                             if(stationInfos.getIntegralPrintFlag().equals("1")){
-                                //POS机打印小票
-                                Map<String, Object> map = new HashMap<>();
-                                map.put("orderNo", integralOrderNo);
-                                map.put("createdDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
-                                map.put("payDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
-                                map.put("stationName", stationName);
-                                map.put("waresName", integralOrder.getWaresName());
-                                map.put("exchangeNum", integralOrder.getExchangeNum());
-                                map.put("orderSumIntegral", orderSumIntegral);
-                                map.put("surplusPoints", surplusPoints);
-                                map.put("customerName", integralOrder.getCustomerName());
-                                map.put("orderType", "3");
-                                map.put("stationId", request.getStationId().toString());
-                                this.posPrintReceipt(map);
-                            }
+                                if(stationInfos.getPrintDeviceType().equals("2")){
+                                    //POS机打印小票
+                                    Map<String, Object> map = new HashMap<>();
+                                    map.put("orderNo", integralOrderNo);
+                                    map.put("createdDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
+                                    map.put("payDate", new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime()));
+                                    map.put("stationName", stationName);
+                                    map.put("waresName", integralOrder.getWaresName());
+                                    map.put("exchangeNum", integralOrder.getExchangeNum());
+                                    map.put("orderSumIntegral", orderSumIntegral);
+                                    map.put("surplusPoints", surplusPoints);
+                                    map.put("customerName", integralOrder.getCustomerName());
+                                    map.put("orderType", "integral");
+                                    map.put("stationId", request.getStationId().toString());
+                                    map.put("printSetting", stationInfos.getPrintSetting());
+                                    this.posPrintReceipt(map);
+                                }else {
+                                    //打印机打印小票
+                                    List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());
+                                    if(stationPrinterList != null && stationPrinterList.get(0).get("integralPrintFlag").toString().equals("1")){
+                                        if(stationPrinterList.get(0).get("printerSn") !=null){
+                                            String sn=stationPrinterList.get(0).get("printerSn").toString();
+                                            String content1;
+                                            content1 = "<CB>客户联-积分小票</CB><BR>";
+                                            content1 += "订单号："+integralOrderNo+"  <BR>";
+                                            content1 += "交易时间："+new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime())+" <BR>";
+                                            content1 += "油站："+stationName+"  <BR>";
+                                            content1 += "兑换商品："+integralOrder.getWaresName()+"  <BR>";
+                                            content1 += "商品数量：x "+integralOrder.getExchangeNum()+"  <BR>";
+                                            content1 += "消耗积分： "+orderSumIntegral+" 分<BR>";
+                                            content1 += "剩余积分： "+surplusPoints+" 分<BR>";
+                                            //content1 += "<BOLD><B>消耗积分： "+orderSumIntegral+" 分</B></BOLD><BR>";
+                                            content1 += "客户昵称： "+integralOrder.getCustomerName()+"  <BR>";
+                                            content1 += "<BR>";
 
+                                            String content2;
+                                            content2 = "<CB>商户联-积分小票</CB><BR>";
+                                            content2 += "订单号："+integralOrderNo+"  <BR>";
+                                            content2 += "交易时间："+new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime())+" <BR>";
+                                            content2 += "油站："+stationName+"  <BR>";
+                                            content2 += "兑换商品："+integralOrder.getWaresName()+"  <BR>";
+                                            content2 += "商品数量：x "+integralOrder.getExchangeNum()+"  <BR>";
+                                            content2 += "消耗积分： "+orderSumIntegral+" 分<BR>";
+                                            content2 += "剩余积分： "+surplusPoints+" 分<BR>";
+                                            //content1 += "<BOLD><B>消耗积分： "+orderSumIntegral+" 分</B></BOLD><BR>";
+                                            content2 += "客户昵称： "+integralOrder.getCustomerName()+"  <BR>";
+                                            content2 += "<BR>";
 
+                                            String printInfo = "";
+                                            if(stationInfos.getPrintSetting().equals("1")){
+                                                printInfo = FeiEPrinterUtil.printReceipt(sn, content1);
+                                            }else if(stationInfos.getPrintSetting().equals("2")){
+                                                printInfo = FeiEPrinterUtil.printReceipt(sn, content2);
+                                            }else {
+                                                printInfo = FeiEPrinterUtil.printReceipt(sn, content1 + content2);
+                                            }
+                                            com.alibaba.fastjson.JSONObject jsonObject = JSONObject.parseObject(printInfo);
+                                            if(jsonObject != null && jsonObject.getString("msg").equals("ok")){
+                                                integralOrder.setPrinterStatus("1");
+                                                integralOrderService.updateIntegralOrder(integralOrder);
+                                            }
+                                        }
+                                    }
+                                }
 
-                            //打印机打印小票
-//                            List<Map<String, Object>> stationPrinterList = stationService.getStationPrinterList(request.getStationId());
-//                            if(stationPrinterList != null && stationPrinterList.get(0).get("integralPrintFlag").toString().equals("1")){
-//                                if(stationPrinterList.get(0).get("printerSn") !=null){
-//                                    String sn=stationPrinterList.get(0).get("printerSn").toString();
-//                                    String content1;
-//                                    content1 = "<CB>积分订单小票</CB><BR>";
-//                                    content1 += "订单号："+integralOrderNo+"  <BR>";
-//                                    content1 += "交易时间："+new SimpleDateFormat(" yyyy-MM-dd HH:mm:ss").format(integralOrder.getExchangeTime())+" <BR>";
-//                                    content1 += "油站："+stationName+"  <BR>";
-//                                    content1 += "兑换商品："+integralOrder.getWaresName()+"  <BR>";
-//                                    content1 += "商品数量：x "+integralOrder.getExchangeNum()+"  <BR>";
-//                                    content1 += "消耗积分： "+orderSumIntegral+" 分<BR>";
-//                                    content1 += "剩余积分： "+surplusPoints+" 分<BR>";
-//                                    //content1 += "<BOLD><B>消耗积分： "+orderSumIntegral+" 分</B></BOLD><BR>";
-//                                    content1 += "客户昵称： "+integralOrder.getCustomerName()+"  <BR>";
-//                                    content1 += "<BR>";
-//                                    String printInfo = FeiEPrinterUtil.printReceipt(sn, content1);
-//                                    com.alibaba.fastjson.JSONObject jsonObject = JSONObject.parseObject(printInfo);
-//                                    if(jsonObject != null && jsonObject.getString("msg").equals("ok")){
-//                                        integralOrder.setPrinterStatus("1");
-//                                        integralOrderService.updateIntegralOrder(integralOrder);
-//                                    }
-//                                }
-//                            }
+                            }
                         }else {
                             resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
                         }
@@ -341,6 +365,7 @@ public class IntegralShoppingMallController {
             params.put("posFanoutExchange", stationDeviceManagerInfo.getPosFanoutExchange());
             params.put("posQueue", stationDeviceManagerInfo.getPosQueue());
             params.put("tusn", stationDeviceManagerInfo.getDeviceNo());
+            params.put("printSetting", map.get("printSetting").toString());
         }
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(map);

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -29,6 +29,7 @@ import java.util.*;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class PayController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
     @Resource
@@ -612,6 +613,7 @@ public class PayController {
                                         break;
                                     case "2":   //POS机打印
                                         payOrder.setIntegral(String.valueOf(integral));
+                                        payOrder.setPrintSetting(stationInfos.getPrintSetting());
                                         this.posPrintReceipt(payOrder);
                                         break;
                                 }
@@ -814,10 +816,10 @@ public class PayController {
         if(infoMap !=null && infoMap.containsKey("stationId") && infoMap.get("stationId") !=null){
             m.put("stationId", infoMap.get("stationId").toString());
         }
-        if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
-            m.put("orderType", infoMap.get("orderType").toString());
-        }
-
+//        if(infoMap !=null && infoMap.containsKey("orderType") && infoMap.get("orderType") !=null){
+//            m.put("orderType", infoMap.get("orderType").toString());
+//        }
+        m.put("orderType", "oil");
         logger.info("要推送的订单的信息：" +m.toString());
         //定义推送格式
         Map<String, Object> params = new HashMap<>();
@@ -833,6 +835,7 @@ public class PayController {
             params.put("posFanoutExchange", stationDeviceManagerInfo.getPosFanoutExchange());
             params.put("posQueue", stationDeviceManagerInfo.getPosQueue());
             params.put("tusn", stationDeviceManagerInfo.getDeviceNo());
+            params.put("printSetting", payOrder.getPrintSetting()); //小票打印方式
         }
         List<Map<String, Object>> list = new ArrayList<>();
         list.add(m);

YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -20,6 +20,7 @@ import java.util.*;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class PayOrderController {
     private static Logger logger =(Logger) LoggerFactory.getLogger(PayOrderController.class);
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -35,6 +35,7 @@ import java.util.*;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class PosMachineController {
     @Resource
     private PosMachineService posMachineService;

YijiaRestful/src/main/java/com/platform/yijia/controller/StationController.java

@@ -25,6 +25,7 @@ import java.util.Map;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class StationController {
 
     private static Logger logger =(Logger) LoggerFactory.getLogger(StationController.class);

YijiaRestful/src/main/java/com/platform/yijia/controller/SydDeptController.java

@@ -6,16 +6,14 @@ import com.platform.yijia.param.request.RequestParameter;
 import com.platform.yijia.pojo.SysDept;
 import com.platform.yijia.service.SysDeptService;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class SydDeptController {
 
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/controller/WXLoginController.java

@@ -10,6 +10,7 @@ import com.platform.yijia.utils.HttpClientUtil;
 import com.platform.yijia.utils.SignUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -30,6 +31,7 @@ import java.util.List;
 
 @Controller
 @YiJiaRequest()
+@CrossOrigin
 public class WXLoginController {
 
     @Resource

YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -56,6 +56,7 @@ public class PayOrder implements Serializable {
     private String customerPhone; //客户电话
     private String customerGrade; //客户等级
     private String oilType; //油品类型 oil_type
+    private String printSetting;        //打印方式
 
     private String beginTime;
     private String endTime;