|
|
@@ -55,6 +55,7 @@ public class IntegralShoppingMallController {
|
|
|
@Resource
|
|
|
private GzhNewsTemplateService gzhNewsTemplateService;
|
|
|
|
|
|
+
|
|
|
//获取积分商城轮播图片
|
|
|
@RequestMapping(value = "/getIntegralShopPicInfoList", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@@ -240,46 +241,51 @@ public class IntegralShoppingMallController {
|
|
|
resultData=ResultData.success(CodeMsg.SUCCESS);
|
|
|
}
|
|
|
|
|
|
- //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);
|
|
|
-
|
|
|
- //打印机打印小票
|
|
|
-// 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);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
+ StationPayManage stationPayManage = new StationPayManage();
|
|
|
+ stationPayManage.setStationId(request.getStationId());
|
|
|
+ StationPayManage stationPayManageInfo = stationService.selectStationPayManage(stationPayManage);
|
|
|
+ if(stationPayManageInfo.getPrintDeviceType().equals("1")){
|
|
|
+ //打印机打印小票
|
|
|
+ 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{
|
|
|
+ //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);
|
|
|
+ }
|
|
|
}else {
|
|
|
resultData=ResultData.error(CodeMsg.REQUEST_FAIL);
|
|
|
}
|
JK