Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-common-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInfo.java

@@ -24,6 +24,7 @@ public class ApprovalInfo implements Serializable{
     private ApprovalProduction approvalProduction;//生产审批集合
     private ApprovalApplyPick approvalApplyPick;//提货申请集合
     private List<ApprovalProductionContract> listProductionContract;//审批合同集合
+    private List<HistoricalRecord> listHistoricalRecord;//审批历史信息集合
     private Integer approvalAdminId;//审核人adminid
     private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
 
@@ -154,4 +155,12 @@ public class ApprovalInfo implements Serializable{
     public void setSelectType(Integer selectType) {
         this.selectType = selectType;
     }
+
+    public List<HistoricalRecord> getListHistoricalRecord() {
+        return listHistoricalRecord;
+    }
+
+    public void setListHistoricalRecord(List<HistoricalRecord> listHistoricalRecord) {
+        this.listHistoricalRecord = listHistoricalRecord;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalOrderService.java

@@ -109,4 +109,9 @@ public interface ApprovalOrderService {
      * @return
      */
     ApprovalProduction getApprovalProductionById(Integer approvalId);
+    /**
+     * 查询审批信息产品总数
+     * @return
+     */
+    List<ApprovalProductionItem> getIteminfo(Integer approvalId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickServiceImpl.java

@@ -11,10 +11,12 @@ import com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper;
 import com.iamberry.rst.service.approval.mapper.ApprovalProductionMapper;
 import com.iamberry.rst.service.sys.mapper.SysMapper;
 import com.iamberry.rst.util.PageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -158,6 +160,17 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
             if(approvalOrderMapper.updateApprovalInfo(info) < 1){
                 throw new RuntimeException("修改审批信息失败"+tasknfo);
             }
+            //推送微信模板消息通知
+            SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
+            SendMessageUtil sendMessageUtil = new SendMessageUtil();
+            sendMessageUtil.orderReviewResultsPush("您好，当前有一单提货申请需要处理",
+                    "0000000"+approvalInfo.getApprovalId(),
+                    approvalApplyPick.getApplyPickName(),
+                    "优尼雅仓库",
+                    format.format(new Date()),
+                    "请尽快进行处理",
+                    approvalAdmin.getAdminOpenId(),
+                    "url");
         }
         return  flag;
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -132,7 +132,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 throw new RuntimeException("修改审批信息失败"+tasknfo);
             }
             //推送微信模板消息通知
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
             SendMessageUtil sendMessageUtil = new SendMessageUtil();
             sendMessageUtil.orderReviewResultsPush("你好，你有个订单需要你的审核",
                     approvalProduction.getApplicantOrderNo(),
@@ -229,4 +229,9 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
     public ApprovalProduction getApprovalProductionById(Integer approvalId) {
         return approvalOrderMapper.getApprovalProductionById(approvalId);
     }
+
+    @Override
+    public List<ApprovalProductionItem> getIteminfo(Integer approvalId) {
+        return approvalOrderMapper.getIteminfo(approvalId);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApprovalOrderMapper.java

@@ -96,6 +96,11 @@ public interface ApprovalOrderMapper {
       * @return
       */
      ApprovalProduction getApprovalProductionById(Integer approvalId);
+     /**
+      * 查询审批信息产品总数
+      * @return
+      */
+     List<ApprovalProductionItem> getIteminfo(Integer approvalId);
 
 
 

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -17,6 +17,7 @@
     <collection property="approvalProduction" column="approval_id" ofType="ApprovalProduction" select="getApprovalProduction"/>
     <collection property="approvalApplyPick" column="approval_id" ofType="ApprovalApplyPick" select="getApplyPick"/>
     <collection property="listProductionContract" column="approval_id" ofType="ApprovalProductionContract" select="listProductionContract"/>
+    <collection property="listHistoricalRecord" column="approval_id" ofType="HistoricalRecord" select="listHistoricalRecord"/>
   </resultMap>
 
   <resultMap id="ApprovalProductionResultMap" type="ApprovalProduction" >
@@ -273,6 +274,18 @@
     WHERE ai.approval_id = #{approvalId}
   </select>
 
+  <!--查询审批信息产品总数-->
+  <select id="getIteminfo" parameterType="Integer" resultType="ApprovalProductionItem">
+    SELECT
+    api.item_product_name,
+    api.item_color_name,
+    api.item_product_num
+    from tb_rst_approval_info ai
+    LEFT JOIN tb_rst_approval_production ap on ai.approval_id = ap.approval_id
+		LEFT JOIN tb_rst_approval_production_item api on ap.production_id = api.production_id
+		where ai.approval_id = #{approvalId}
+  </select>
+
 <!--查询审批信息列表-->
   <select id="listApprovalInfo" parameterType="ApprovalInfo" resultMap="ApprovalInfoResultMap">
     SELECT
@@ -576,4 +589,18 @@
     where
     ap.approval_id = #{approvalId}
   </select>
+
+  <select id="listHistoricalRecord" parameterType="Integer" resultType="HistoricalRecord">
+    SELECT
+    hr.record_id recordId,
+    hr.approval_id approvalId,
+    hr.admin_id adminId,
+    hr.record_state recordState,
+    hr.task_id taskId,
+    hr.approval_time approvalTime,
+    hr.record_create_time recordCreateTime
+    from tb_rst_historical_record hr
+    where
+       hr.approval_id = #{approvalId}
+  </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -7,6 +7,7 @@ import com.iamberry.rst.core.approval.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
+import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.faces.approval.ApprovalOrderService;
 import com.iamberry.rst.faces.approval.ApprovalTaskService;
 import com.iamberry.rst.faces.sys.SysService;
@@ -48,6 +49,8 @@ public class ApprovalController {
     private ApprovalTaskService approvalTaskService;
     @Autowired
     private SysService sysService;
+    @Autowired
+    private ApplyPickService applyPickService;
     @SuppressWarnings("restriction")
     private BASE64Decoder decoder = new BASE64Decoder();
     /**
@@ -66,7 +69,7 @@ public class ApprovalController {
         }
         //获取openid,根据openid查询当前登录人信息
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
-        /*String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";*/
+        /*String openId = "oEy-_s5C7LwmLGTpEGfJoecfsYZc";*/
 
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(1);
@@ -104,7 +107,7 @@ public class ApprovalController {
             JSONObject contract = jsonproductionContracts.getJSONObject(i);
             ApprovalProductionContract contractInfo = new ApprovalProductionContract();
             contractInfo.setContractUrl(contract.getString("contractUrl"));
-            contractInfo.setContractName(contract.getString("contractName"));
+            contractInfo.setContractType(contract.getString("contractType"));
             listProductionContract.add(contractInfo);
         }
         boolean returnValue = approvalOrderService.insertApprovalProduction(approvalProduction,listApprovalProductionItem,listProductionContract,taskinfo,openId);
@@ -206,21 +209,20 @@ public class ApprovalController {
             }
             if (type == null) {
                 System.err.println("上传图片异常..." + fileHead);
-
             } else {
                 String fileName = getFileName(suffixName, type);
                 boolean flag = generateImage(shareImgUrl, imgFilePath + "/" + fileName);
                 if(flag){
-                    imgUrl = imgFilePath + fileName;
                     responseJson.setReturnCode(200);
                     responseJson.addResponseKeyValue("imgUrl",ResultInfo.CONTRACT_IMAGE+fileName);
                 }else{
-                    /*imgUrl = "/iamberry/default.png";*/
                     responseJson.setReturnCode(500);
                 }
             }
+        }else{
+            responseJson.setReturnCode(500);
         }
-        responseJson.setReturnCode(500);
+
         //返回值拼凑
         /*String requurl = req.getContextPath();//获取web项目的路径*/
 
@@ -330,20 +332,20 @@ public class ApprovalController {
             @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         //获取openid,根据openid查询当前登录人信息
-        /*String openId = WechatUtils.getUserBySession(request).getUserOpenid();*/
-        String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        /*String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";*/
         Admin admin = sysService.getByOpenid(openId);
         if(admin == null){
             return new ResponseJson(200, "未查询到登录人信息", 500);
         }
-        if(selectType == null){
-            return new ResponseJson(200, "参数不完整，缺少查询类型字段", 500);
-        }
-        if(selectType == 1){//我发起的
-            approvalInfo.setAdminId(admin.getAdminId());
-        }else if(selectType == 2){//我审核的
-            approvalInfo.setApprovalAdminId(admin.getAdminId());
+        if(selectType != null){
+            if(selectType == 1){//我发起的
+                approvalInfo.setAdminId(admin.getAdminId());
+            }else if(selectType == 2){//我审核的
+                approvalInfo.setApprovalAdminId(admin.getAdminId());
+            }
         }
+
         PagedResult<ApprovalInfo> pagedResult = approvalOrderService.listApprovalInfo(pageNO, pageSize,approvalInfo,totalNum == null);
 
         if (totalNum != 0) {
@@ -412,23 +414,70 @@ public class ApprovalController {
                     if(approvalOrderService.updateApprovalInfo(info) < 1){
                         return  ResponseJson.getFAILURE();
                     }
-                    //推送微信模板消息通知
-                    SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
-                    ApprovalProduction production = approvalOrderService.getApprovalProductionById(approvalInfo.getApprovalId());
-                    Admin admininfo = new Admin();
-                    admininfo.setAdminId(production.getApplicantId());
-                    admininfo = sysService.getAdminInfo(admininfo);
-                    if(admininfo.getAdminOpenId() == null ){
-                        return  ResponseJson.getFAILURE();
+                    //判断是生产审批或提货审批
+                    if(info.getApprovalType() == 1){
+                        //推送微信模板消息通知
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
+                        ApprovalProduction production = approvalOrderService.getApprovalProductionById(approvalInfo.getApprovalId());
+                        Admin admininfo = new Admin();
+                        admininfo.setAdminId(production.getApplicantId());
+                        admininfo = sysService.getAdminInfo(admininfo);
+                        if(admininfo.getAdminOpenId() == null ){
+                            return  ResponseJson.getFAILURE();
+                        }
+                        //通知申请人该审批已通过
+                        SendMessageUtil sendMessageUtil = new SendMessageUtil();
+                        sendMessageUtil.reviewResultsPush("亲，您提交的申请 "+admin.getAdminName()+" 已处理。",
+                                production.getApplicantName(),
+                                "通过",
+                                format.format(new Date()),
+                                "审核通过后可通过公众号进入系统",
+                                admininfo.getAdminOpenId(),
+                                "url");
+                        //通知仓库订单已确认
+                        //获取仓库人员openid
+                        Admin adminTwo = new Admin();
+                        adminTwo.setAdminId(68);//仓库管理员id
+                        adminTwo = sysService.get(adminTwo);
+                        List<ApprovalProductionItem> items = approvalOrderService.getIteminfo(approvalInfo.getApprovalId());
+                        String products = "";
+                        Integer num = 0;
+                        for(ApprovalProductionItem item : items){
+                            products = products + item.getItemProductName()+",";
+                            num = item.getItemProductNum()+num;
+                        }
+                        products = products.substring(0,products.length() - 1);
+                        sendMessageUtil.putStoragePush(admininfo.getAdminName()+"的生产订单已确认，请在生产入库后确认",
+                                products,
+                                ""+num,
+                                admin.getAdminName(),
+                                "优尼雅仓库",
+                                "如有疑问请联系上级领导人",
+                                adminTwo.getAdminOpenId(),
+                                "url");
+                    }else{
+                        //通知申请人该提货审批已通过
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
+                        ApprovalApplyPick  approvalApplyPick = new ApprovalApplyPick();
+                        approvalApplyPick.setApprovalId(approvalInfo.getApprovalId());
+                        List<ApprovalApplyPick> pickList = applyPickService.getApprovalApplyPickList(approvalApplyPick);
+                        String products = "";
+                        for(ApprovalApplyPickItem PickItem : pickList.get(0).getListApplyPickItem()){
+                            products = products+PickItem.getItemProductName()+"，";
+                        }
+                        products = products.substring(0,products.length()-1);
+                        Admin admininfo = new Admin();
+                        admininfo.setAdminId(pickList.get(0).getAdminId());
+                        admininfo = sysService.getAdminInfo(admininfo);
+                        SendMessageUtil sendMessageUtil = new SendMessageUtil();
+                        sendMessageUtil.applicationFormPush("您的申领单被 "+admin.getAdminName()+" 通过。",
+                                format.format(new Date()),
+                                "0000000"+approvalInfo.getApprovalId(),
+                                products,
+                                "点击查看详情",
+                                admininfo.getAdminOpenId(),
+                                "url");
                     }
-                    SendMessageUtil sendMessageUtil = new SendMessageUtil();
-                    sendMessageUtil.reviewResultsPush("亲，您提交的申请 "+admin.getAdminName()+" 已处理。",
-                            production.getApplicantName(),
-                            "通过",
-                            format.format(new Date()),
-                            "审核通过后可通过公众号进入系统",
-                            admininfo.getAdminOpenId(),
-                            "url");
 
                 }else if((Integer) taskMap.get("status") == 0){//还有下一个审批人，需要增加审批历史任务
                     if(taskMap.get("users") == null){
@@ -455,8 +504,8 @@ public class ApprovalController {
                         if(approvalOrderService.updateApprovalInfo(info) < 1){
                             return  ResponseJson.getFAILURE();
                         }
-                                //推送微信模板消息通知
-                                //查询审批订单信息
+                        //推送微信模板消息通知
+                          //查询审批订单信息
                         ApprovalProduction production = approvalOrderService.getApprovalProductionById(approvalInfo.getApprovalId());
                         SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
                         SendMessageUtil sendMessageUtil = new SendMessageUtil();
@@ -539,7 +588,10 @@ public class ApprovalController {
             return  ResponseJson.getFAILURE();
         }
         List<ApprovalInfo> info = approvalOrderService.getApprovalInfo(approvalInfo);
-        rj.addResponseKeyValue("approvalInfo",info);
+        if(info.size() < 1){
+            return  ResponseJson.getFAILURE();
+        }
+        rj.addResponseKeyValue("approvalInfo",info.get(1));
         return rj;
     }
 
@@ -562,6 +614,9 @@ public class ApprovalController {
         if(admin == null){
             return new ResponseJson(200, "未查询到登录人信息", 500);
         }
+        Integer appvalId = 0;
+        Integer productNum = 0;
+        String productName = "";
         JSONArray jsonRecordss = JSONArray.fromObject(inventoryRecordss);
         for (int i = 0; i < jsonRecordss.size(); i++) {
             JSONObject jsonRecords = jsonRecordss.getJSONObject(i);
@@ -597,7 +652,27 @@ public class ApprovalController {
             if(approvalOrderService.updateProductionItem(productionItem) < 1){
                 return new ResponseJson(200, "修改审批产品项失败", 500);
             }
+            appvalId = jsonRecords.getInt("approvalId");
+            productNum = productNum + jsonRecords.getInt("actualStorage");
+            productName = productName + jsonRecords.getInt("productName")+",";
+
         }
+        //推送入库微信模板消息通知
+        //查询审批订单信息
+        ApprovalInfo approvalInfo = approvalOrderService.getApprovalInfoById(appvalId);
+        SendMessageUtil sendMessageUtil = new SendMessageUtil();
+        productName = productName.substring(0,productName.length() - 1);
+        Admin adminTwo = new Admin();
+        adminTwo.setAdminId(68);//仓库管理员id
+        adminTwo = sysService.get(adminTwo);
+        sendMessageUtil.putStoragePush(approvalInfo.getApprovalName()+"已入库，本次入口总数量"+productNum+"台",
+                productName,
+                ""+productNum,
+                admin.getAdminName(),
+                "优尼雅仓库",
+                "如有疑问请联系上级领导人",
+                adminTwo.getAdminOpenId(),
+                "url");
         return rj;
     }
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/giftCard/GiftCardServiceImpl.java

@@ -6,7 +6,21 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.core.entity.coupon.CouponType;
+import com.iamberry.wechat.core.entity.mq.MQMessage;
+import com.iamberry.wechat.core.entity.order.OrderItem;
+import com.iamberry.wechat.face.porduct.ProductColorService;
+import com.iamberry.wechat.tools.DateTimeUtil;
+import com.iamberry.wechat.tools.HttpClient431Util;
+import com.iamberry.wechat.tools.NameUtils;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -93,14 +107,121 @@ public class GiftCardServiceImpl implements GiftCardService {
 		if (agentMapper.updateAgentCardSum(agentInfo) <= 0) {
 			throw new RuntimeException();
 		}
-		
-		// 推送百胜
+
+		//推送到rst
+		String url = NameUtils.getConfig("rst_efast_base_url");
+		Map<String, String> requestData = new HashMap<String, String>();
+		/**
+		 * 系统级参数
+		 */
+		requestData.put("app_act", "rst.trade.new.add");
+
+		/**
+		 * 订单基本信息
+		 */
+		String[] addressDesc = machineInfo.getUserMachineAddressInfo().split("-");
+
+		//判断收货地址从而选择仓库
+		String sd_id = NameUtils.getConfig("sd_id");
+
+		String address = addressDesc[3];
+		if (addressDesc[3] != null) {
+			Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+			Matcher m = p.matcher(addressDesc[3]);
+			if (m.find()) {
+				address = m.replaceAll("");
+			}
+		}
+		String provinceName = addressDesc[0];
+		if (addressDesc[0].indexOf("北京") != -1) {
+			provinceName = "北京";
+		} else if (addressDesc[0].indexOf("上海") != -1) {
+			provinceName = "上海";
+		} else if (addressDesc[0].indexOf("天津") != -1) {
+			provinceName = "天津";
+		} else if (addressDesc[0].indexOf("重庆") != -1) {
+			provinceName = "重庆";
+		}
+		//颜色表查询
+		ProductColor productColor =	colorMapper.selectProductColorById(machineInfo.getUserMachineColorId());
+		Map<String, Object> orderData = new HashMap<String, Object>();
+		orderData.put("add_time", DateTimeUtil.format(new Date()));        // 时间
+		orderData.put("address", address);                                                // 收货地址
+		orderData.put("city_name", addressDesc[1]);                                    // 城市
+		orderData.put("consignee", machineInfo.getUserMachineAddressName());                        // 收货人
+		orderData.put("district_name", addressDesc[2]);                                    // 区域
+		orderData.put("email", "");                                                        // email
+		orderData.put("goods_amount", productColor.getColorDiscount() / 100);                    // 商品总价
+		orderData.put("goods_count", 1);                                        // 产品数量
+		orderData.put("mobile", machineInfo.getUserMachineAddressTel());                            // 手机号码
+		orderData.put("money_paid", productColor.getColorDiscount() / 100);                                        // 已付款
+		orderData.put("oid", "DH00000000" + machineInfo.getUserMachineId());                                    // 订单号
+		orderData.put("order_amount", productColor.getColorDiscount() / 100);                                    // 应付款,应付款金额要与已付款金额相同
+		/**
+		 * 产品信息
+		 */
+		List<Map<String, Object>> maps = new ArrayList<Map<String, Object>>();
+			Map<String, Object> orders1 = new HashMap<String, Object>();
+			orders1.put("goods_name", "【美国watero】净饮水一体机");                            // 产品名称
+			orders1.put("goods_number", 1);                                    // 产品数量
+			orders1.put("goods_price", productColor.getColorDiscount() / 100);                    // 产品原价
+			orders1.put("outer_sku", productColor.getColor69Code());                                // 产品SKU
+			orders1.put("payment_ft", productColor.getColorDiscount() / 100);                // 产品分摊价
+			maps.add(orders1);
+		orderData.put("orders", maps);                                                    // 订单产品
+		orderData.put("pay_name", "weixinpay");                                            // 支付方式
+		orderData.put("pay_time", DateTimeUtil.format(new Date()));// 支付时间
+		orderData.put("postscript","");                        // 买家留言
+		orderData.put("province_name", provinceName);                                    // 省份
+		orderData.put("sd_id", sd_id);                                                    // 对应 efast 店铺 id
+		orderData.put("shipping_fee", 0);                                                // 快递费
+		orderData.put("shipping_name", "yto");                                            // 快递公司代码
+		orderData.put("tel", machineInfo.getUserMachineAddressTel());                                            // 我司电话
+		orderData.put("to_buyer", "");                                                    // 商家备注
+		//orderData.put("total_amount", (order.getSalesAmount()/100.0));					// 订单总额
+		orderData.put("total_amount", (productColor.getColorDiscount() / 100));                    // 订单总额
+		orderData.put("user_name", machineInfo.getUserMachineOpenId());                            // 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
+		orderData.put("zipcode", "000000");                        // 邮编
+
+
+		com.fasterxml.jackson.databind.ObjectMapper mapper = new ObjectMapper();
+		String orderDataStr = null;
+		;
+		try {
+			orderDataStr = mapper.writeValueAsString(orderData);
+		} catch (JsonProcessingException e2) {
+			e2.printStackTrace();
+		}
+
+		requestData.put("info", orderDataStr);
+
+		try {
+
+			String result = HttpClient431Util.doPost(requestData, url);
+			result = StringEscapeUtils.unescapeJava(result); // unicode 编码
+			// parse JSON String to Object
+			JSONObject jsonObject = JSONObject.fromObject(result);
+			//JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+			String oderSn = jsonObject.getString("oder_sn");
+			if (oderSn != null) {
+				String msg = jsonObject.getString("msg");
+				if ("success".equals(msg)) {
+					throw new RuntimeException();
+				}
+			}
+			throw new Exception(jsonObject.getString("msg"));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+
+		/*// 推送百胜
 		try {
 			efastOrderService.giftCard(machineInfo.getUserMachineAddressInfo(), "DH00000000" + machineInfo.getUserMachineId(), machineInfo.getUserMachineColorId()
 					, machineInfo.getUserMachineAddressName(), machineInfo.getUserMachineAddressTel(), machineInfo.getUserMachineOpenId());
 		} catch (Exception e) {
 			e.printStackTrace();
-		}
+		}*/
 		return presentMachineAndClearAgentCardNum(agentInfo);
 	}
 	
@@ -164,8 +285,8 @@ public class GiftCardServiceImpl implements GiftCardService {
 	}
 	/**
 	 * 批量添加礼品卡信息和赠送的机器物流信息
-	 * @param request
-	 * @param agentMachine
+	 * @param
+	 * @param
 	 * @return
 	 * @throws Exception
 	 */