售货机 推货和推送

src/main/java/com/minpay/common/action/VendingMachineAction.java

@@ -70,7 +70,7 @@ public class VendingMachineAction implements IMINAction {
 			@MINParam(key = "deliveryNo") String deliveryNo,
 			@MINParam(key = "returnUrl") String returnUrl,
 			@MINParam(key = "channel") String channel,
-			@MINParam(key = "orderId") String orderId,
+			@MINParam(key = "orderNo") String orderNo,
 			MINHttpServletRequestContext  MINRequest
 			) throws MINBusinessException, InterruptedException {
 		MINActionResult res = new MINActionResult();
@@ -139,7 +139,7 @@ public class VendingMachineAction implements IMINAction {
 
 			restList.add(imeiAddr);     //机台号
 			restList.add("|");
-			restList.add(orderId);	//订单号
+			restList.add(orderNo);	//订单号
 			restList.add("]");
 			restList.add("(bFA 00 06 00 24");
 			String cargoNo16 = DataUtil.str10ToStr16(Integer.valueOf(cargoNo));

src/main/java/com/minpay/ma/client/ChatServer.java

@@ -28,7 +28,7 @@ import com.startup.minpay.util.Log;
  */
 public class ChatServer {
 	
-    private final int PORT = 7788;
+    private final int PORT = 10086;
     
     private boolean running = false;
     
@@ -120,6 +120,7 @@ public class ChatServer {
      * @throws IOException 
      */
     public static String sendMsg(String param, String socketId) throws IOException {
+        Log.info("发送消息:" + param);
     	Socket socket = socketList.get(socketId);
     	String ret = "200";
     	if(socket != null) {