呵呵商城订单退款

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -727,7 +727,8 @@ public class CmRefundsProductController extends BaseController {
             logger.info(e.getMessage());
             e.printStackTrace();
         }
-        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/";
+        CmReturnedPurchase returnedPurchase = cmReturnedPurchaseDao.get(cmReturnedPurchase);
+        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + returnedPurchase.getOrderType();
     }
 
     /**
@@ -759,18 +760,16 @@ public class CmRefundsProductController extends BaseController {
      */
     @RequestMapping(value = "revokeApply")
     public String revokeApply(CmReturnedPurchase cmReturnedPurchase, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
-        NewOrder order = new NewOrder();
         try {
             cmReturnedPurchase = cmReturnedPurchaseService.get(cmReturnedPurchase.getId());
             if (!"2".equals(cmReturnedPurchase.getStatus())) {
                 throw new Exception("该退款单状态已发生改变，不可撤销");
             }
-            order = newOrderService.findByOrderID(cmReturnedPurchase.getOrderID());
             cmReturnedPurchaseService.revokeApply(cmReturnedPurchase, request);
         } catch (Exception e) {
             addMessage(redirectAttributes, e.getMessage());
             e.printStackTrace();
         }
-        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + order.getOrderType();
+        return "redirect:" + Global.getAdminPath() + "/order/cmReturnedPurchase/list?orderType=" + cmReturnedPurchase.getOrderType();
     }
 }

src/main/java/com/caimei/modules/order/service/CmDiscernReceiptService.java

@@ -76,7 +76,7 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
                         }
                         if (2 == orderType) {
                             //呵呵商城订单
-                            Integer orderId = (Integer) map.get("orderID");
+                            Integer orderId = ((Long) map.get("orderID")).intValue();
                             NewOrder order = newOrderDao.findByOrderID(orderId);
                             String name = heHeNewOrderDao.findHeUser(order.getUserID());
                             bean.setName(name);

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -626,16 +626,28 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         String merAccount = "aa9aee6a148843a6a9e4ea117df4454b";
         //私钥,商户密钥
         String merKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAM0qCTZFdi1I59/Jeis+8KVhzSNhsRrKiOlHazIVyxNLzUQvFpWN5PlfVKlnJToorURTStfjAv01HD0Z4ZvMauuHhDT0bptiDln928Ld6SzX889X2nsCxl0Q+WzrkFsnT6gotvGnTeQGUgbBV3SQD3IUOwRwxoWYbrZqxtqHFxqRAgMBAAECgYEAvsHx9MMbAToDVmEXtXP8/lh0Cwy/RgDA0d30voni2pslTNtXbVCUcIUBy8y6oVvG1nt3YEmTsuiZy/nvehPT6GV1Gqj8T6lqWQ8KQKsDGlubvh23tzNM90me2TLZEPdNqC5CPRrwYrjght4BXgzu7s2+5FpeYCob1gVNi+w0Jz0CQQD0dXb9Oez+Ybnxb3rCghGWM6cxi8fsqk6MuKaleg53qfXrkgAVH78faeWzRaeSbVOh5+Z9kX5HUeynfM7E/f4nAkEA1tmnvJp4JQaouO1Trzbnkhowjea5daK/tDE8K0hIMHUjAw+c1QTteGOVGBFBHWPkUwkSCd2HKmk4URkp/snMhwJAO32+qF+Jclq8EqqLmHxo5UHKxX7793d2yD5Dp++tR6fgBiUwyfNA4tc1pEwmPLdIbBVwfUyEC70/N39jHoOlbwI/dX6SPJI9IgKCQp+HJEriWQP5iaCjy7E1JVXHkeP1lop4mzPukJAhTbUn1AGbmncGZmKPetWrFYZ1ReR9EtlJAkEA2kBmARWyOTt8fbikImuHr65M+BDgD+2fkuDb5+tqJljNmSqAIRRwcXj1Je6vkzlDJuSw3wlG6iliFtwe0cq7+w==";
+
         //维沙商户标识
         String wsMerAccount = "f8248975517a4feab79cac9d7d453663";
         //维沙私钥,商户密钥
         String wsMerKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAI4Rb9HBUbjzEsfCOWUsogq8pOoxcSGcL1WFQfqHY1Ul2UwVO5daQtS1pxyM8gKPvvcxNsxz5+wdzb7/cX+SewdF8GbTO2LQIMsOAvtQszsMW8+Hg3J3QFPCHUGh+Q//JXWTFu/GaIlBrpmc7qnB+OMmP315taf5vAmAxC7OzohlAgMBAAECgYBgDiwTn2j46uicxZZ28MmTBt9eNRWvyuE6KoJkuJuR26hjR8vl1rJvDW8y351V3AkbK1xIumlp/PC6ng4IWmrxgu9zuGu+qpb4BdcarS1RMcnpjynCKYO0BnMZBcFrKzWiD6IyZIlLIlJHIDC0mXI/x5V9zG9rL4Tkm4mQPRhzlQJBAPUPledDZXTp2ovvMdL7baI+QVs+tfBqdIdcCgSoEhFh2T/dNVMpBVIjH2D6jTwL94tvWRchMwjXNUSWTRYMH2sCQQCUaOjFeLhSI/gK+f/yXNX/wP6WjXFE9/vuNEaxuaYja2Ia8OwLYoFAYQvKrxLGoHkiI9qKGfqv2h91nF/w/ftvAkBCZA2NkNG8wdpGjO/no9xI1yrnqG6sCns1bLb+GfaDJQoxZiGbPQLHBOLsaBS5Ttiquujc/k6QN5Wj1kBeF7yvAkEAgvWcSfz/8YPJ8q2u3EhtknTUcze29xw5FHbO1y+yWlj8xjdIo7c1xQCd7inVUK70lVq8Etdf7mN1FUx7IOaOQwJAaAl8RFO8zXKy9CdiSsC+2N2qUGLDVOiOJL70Ulh1WxnbLPbwZWCifUu3/UU798dNiZ5Gd06XYinL7lonWpOiEg==";
+
+        //呵呵商户标识
+        String heHeMerAccount = "150a5459416b4046b9153c1cd442e397";
+        //呵呵 私钥,商户密钥
+        String heHeMerKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIggpVq2S1JLH0szxurEgVTz4JTpoyO6/YreVP3xl2bcVj8ekVU+GBwLXNhokxOavgY116XxScinFPa/VoWhaVzyLTbvKz5B6yytuRc3OkSqdDj83jCk+mpmJ5UuCRQ3jesaZAxRpPLzLc99sPtD7xnzEd9UWG8Hlnm6ATmmEQhDAgMBAAECgYBPX+nLGRyWYaNfsFM+tVJMfN/pNMqhnPkWLkoUwPhtS/EmYOaRc+GPCLkcnu2Tstk2udKCuk0xqOs6bZs/1DygxzifYUltWFpqQ2gfmDMoOL4GOflXEHIpoSzSinXz8rjjlQU0wgkbNn6wV6Ao4Jxm5Rzmr9mvTKrAwsnY2eZnYQJBAP+Gj3rrJ7s5778jCramS7yLei2ljkHa/7P0MQsJ+B02/V5CFCh6qKZ2aaAQdk6Z7og5f641TrKX76QetDItSgsCQQCIYVdOdkC3+P6r7WYKXEJ8fdIrf2xyhcCAt9I4q+rcID+ZQ+UqzPoBuib/xpgBZVukDpj9BbIyObyStkvQsNWpAkBd6ADQ5pz6ZKdkMiecym6pAwVKwz4Nm8M/Si2/5dEGQ5BH1Lb9zV4vlvLofURNTKrp61+uES8z2TybryEAE77TAkAD8YSbwTGX4DxE7mVf8VD+1oiIN3QET7fEQQx0FQyCdvA/10W+GhU0jZRpGu30RGEE+mMUFeEUMLUyLNE+ZI6ZAkEA2t0rz4UpljOPms3yfxvzFnShBdshFZOy8kZRG/+OL9entaSOJ0gDmfeFBE9oWXwTj8aVasgbrBV1HjNfyb8WfA==";
+
         NewOrder order = newOrderService.findByOrderID(orderId);
         if (order != null && order.getOrganizeID() >= 2) {
             //维沙订单退款
             merAccount = wsMerAccount;
             merKey = wsMerKey;
         }
+        if (order != null && "2".equals(order.getOrderType())) {
+            //呵呵商城退款
+            merAccount = heHeMerAccount;
+            merKey = heHeMerKey;
+        }
         List<CmReceiptOrderRelation> relationList = cmReceiptOrderRelationDao.findByOrderID(orderId.toString());
         if (null != relationList && relationList.size() > 0) {
             for (CmReceiptOrderRelation orderRelation : relationList) {

src/main/resources/mappings/modules/order/CmReturnedPurchaseMapper.xml

@@ -38,6 +38,7 @@
 		a.bankAccountType AS "bankAccountType",
 		a.confirmReturnTime AS "confirmReturnTime",
 		b.orderNo as "orderNo",
+		b.orderType as "orderType",
 		c.userName as "userName",
 		c.name as "name",
 		c.userOrganizeID as "userOrganizeId"