Merge remote-tracking branch 'remotes/origin/developer' into developerA

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/newhome/web/NewActivityController.java

@@ -1,21 +1,12 @@
 package com.caimei.modules.newhome.web;
 
-import com.caimei.modules.miniprogram.entity.CmWxArticle;
 import com.caimei.modules.miniprogram.utils.DateUtils;
 import com.caimei.modules.newhome.entity.ActType;
-import com.caimei.modules.newhome.entity.NewPageFloor;
-import com.caimei.modules.newhome.service.NewPageFloorService;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.entity.*;
-import com.caimei.modules.product.service.BigTypeService;
 import com.caimei.modules.product.service.ProductService;
-import com.caimei.modules.product.service.SmallTypeService;
-import com.caimei.po.TinyType;
+import com.caimei.redis.RedisService;
 import com.caimei.utils.AppUtils;
-import com.cmme.modules.product.entity.CmmeBigtype;
-import com.cmme.modules.product.entity.CmmeSmalltype;
-import com.cmme.modules.product.service.CmmeBigtypeService;
-import com.cmme.modules.product.service.CmmeSmalltypeService;
-import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
@@ -28,9 +19,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
@@ -43,10 +34,12 @@ import java.util.*;
 @Controller
 @RequestMapping(value = "${adminPath}/newhome/newActivity")
 public class NewActivityController extends BaseController {
-
+    @Autowired
+    private RedisService redisService;
 	@Autowired
 	private ProductService productService;
-
+    @Resource
+    private GenerateUtils generateUtils;
 	@ModelAttribute
 	public Product get(@RequestParam(required=false) String id) {
 		Product entity = null;
@@ -58,7 +51,7 @@ public class NewActivityController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	@RequiresPermissions("newhome:newActivity:view")
 	@RequestMapping(value = {"list","", "groupList"})
 	public String list(Product product,String message, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -157,6 +150,7 @@ public class NewActivityController extends BaseController {
             returnUrl = "/newhome/newActivity?repage";
         }
 		productService.save(product);
+		cleanRedisCache();
 		addMessage(redirectAttributes, "保存商品信息成功");
 		return "redirect:"+ Global.getAdminPath()+returnUrl;
 	}
@@ -212,6 +206,7 @@ public class NewActivityController extends BaseController {
             product.setActSort("1");
         }
         productService.updateActive(product);
+        cleanRedisCache();
         addMessage(redirectAttributes, "保存推荐商品成功");
         return "redirect:" + Global.getAdminPath() + "/newhome/newActivity/?repage";
     }
@@ -220,6 +215,7 @@ public class NewActivityController extends BaseController {
     @RequestMapping(value = "updateActivity")
     public String updateActivity(Product product,RedirectAttributes redirectAttributes) {
         productService.updateActive(product);
+        cleanRedisCache();
         addMessage(redirectAttributes, "保存推荐商品成功");
         return "redirect:" + Global.getAdminPath() + "/newhome/newActivity/?repage";
     }
@@ -235,6 +231,7 @@ public class NewActivityController extends BaseController {
             returnUrl = "/newhome/newActivity/groupList?repage";
         }
         productService.deleteActive(product);
+        cleanRedisCache();
         addMessage(redirectAttributes, "删除推荐成功");
         return "redirect:"+Global.getAdminPath()+returnUrl;
     }
@@ -265,4 +262,19 @@ public class NewActivityController extends BaseController {
         model.addAttribute("product", product);
         return "modules/newhome/updateActivityForm";
     }
-}
+
+
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        //首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+        // 重新生成静态首页
+        generateUtils.generateHome();
+
+    }
+
+}

src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -4,6 +4,7 @@ import com.caimei.constants.common.RedisKeyUtil;
 import com.caimei.modules.miniprogram.utils.UploadPicUtils;
 import com.caimei.modules.newhome.entity.NewPageFirstNavigation;
 import com.caimei.modules.newhome.service.NewPageFirstNavigationService;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.redis.RedisService;
 import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;
@@ -12,6 +13,7 @@ import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -45,7 +47,8 @@ public class NewPageFirstNavigationController extends BaseController {
 
     @Resource
     private RedisService redisService;
-
+    @Resource
+    private GenerateUtils generateUtils;
     @ModelAttribute
     public NewPageFirstNavigation get(@RequestParam(required = false) String id) {
         NewPageFirstNavigation entity = null;
@@ -202,5 +205,7 @@ public class NewPageFirstNavigationController extends BaseController {
         //首页导航栏缓存
         String getNavMenu = "getNavMenu*";
         redisService.removePattern(getNavMenu);
+        // 重新生成静态首页
+        generateUtils.generateHome();
     }
 }

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -4,6 +4,7 @@ import com.caimei.modules.newhome.entity.NewPageFloor;
 import com.caimei.modules.newhome.entity.NewPageFloorContent;
 import com.caimei.modules.newhome.entity.NewPageFloorImage;
 import com.caimei.modules.newhome.service.NewPageFloorService;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.product.service.ProductService;
 import com.caimei.redis.RedisService;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
@@ -47,6 +49,9 @@ public class NewPageFloorController extends BaseController {
     @Autowired
     private RedisService redisService;
 
+    @Resource
+    private GenerateUtils generateUtils;
+
     @ModelAttribute
     public NewPageFloor get(@RequestParam(required = false) String id) {
         NewPageFloor entity = null;
@@ -318,5 +323,9 @@ public class NewPageFloorController extends BaseController {
         //首页缓存
         String homeData = "getHomeData*";
         redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+        // 重新生成静态首页
+        generateUtils.generateHome();
+
     }
-}
+}

src/main/java/com/caimei/modules/newhome/web/NewPageFriendshipLinkController.java

@@ -1,8 +1,10 @@
 package com.caimei.modules.newhome.web;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.redis.RedisService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +36,8 @@ public class NewPageFriendshipLinkController extends BaseController {
 
 	@Autowired
 	private RedisService redisService;
-	
+    @Resource
+    private GenerateUtils generateUtils;
 	@ModelAttribute
 	public NewPageFriendshipLink get(@RequestParam(required=false) String id) {
 		NewPageFriendshipLink entity = null;
@@ -46,11 +49,11 @@ public class NewPageFriendshipLinkController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	@RequiresPermissions("newhome:newPageFriendshipLink:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(NewPageFriendshipLink newPageFriendshipLink, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<NewPageFriendshipLink> page = newPageFriendshipLinkService.findPage(new Page<NewPageFriendshipLink>(request, response), newPageFriendshipLink); 
+		Page<NewPageFriendshipLink> page = newPageFriendshipLinkService.findPage(new Page<NewPageFriendshipLink>(request, response), newPageFriendshipLink);
 		model.addAttribute("page", page);
 		return "modules/newhome/newPageFriendshipLinkList";
 	}
@@ -73,7 +76,7 @@ public class NewPageFriendshipLinkController extends BaseController {
 		addMessage(redirectAttributes, "保存新友情链接成功");
 		return "redirect:"+Global.getAdminPath()+"/newhome/newPageFriendshipLink/?repage";
 	}
-	
+
 	@RequiresPermissions("newhome:newPageFriendshipLink:delete")
 	@RequestMapping(value = "delete")
 	public String delete(NewPageFriendshipLink newPageFriendshipLink, RedirectAttributes redirectAttributes) {
@@ -92,5 +95,7 @@ public class NewPageFriendshipLinkController extends BaseController {
 		if (redisService.exists(getFriendLinks)) {
 			redisService.remove(getFriendLinks);
 		}
+        // 重新生成静态首页
+        generateUtils.generateHome();
 	}
-}
+}

src/main/java/com/caimei/modules/newhome/web/NewPageHomeimageController.java

@@ -3,6 +3,7 @@ package com.caimei.modules.newhome.web;
 import com.caimei.constants.common.RedisKeyUtil;
 import com.caimei.modules.newhome.entity.NewPageHomeimage;
 import com.caimei.modules.newhome.service.NewPageHomeimageService;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.redis.RedisService;
 import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;
@@ -38,7 +39,8 @@ public class NewPageHomeimageController extends BaseController {
     private RedisService redisService;
     @Autowired
     private NewPageHomeimageService newPageHomeimageService;
-
+    @Resource
+    private GenerateUtils generateUtils;
     @ModelAttribute
     public NewPageHomeimage get(@RequestParam(required = false) String id) {
         NewPageHomeimage entity = null;
@@ -139,7 +141,9 @@ public class NewPageHomeimageController extends BaseController {
             if (redisService.exists(crm)) {
                 redisService.remove(crm);
             }
+            // 重新生成静态首页
+            generateUtils.generateHome();
         }
     }
 
-}
+}

src/main/java/com/caimei/modules/newhome/web/NewPageQualitySupplierController.java

@@ -1,10 +1,12 @@
 package com.caimei.modules.newhome.web;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.caimei.constants.common.RedisKeyUtil;
 import com.caimei.modules.newhome.entity.NewPageQualitySupplierImage;
+import com.caimei.modules.opensearch.GenerateUtils;
 import com.caimei.modules.product.entity.CmBigtype;
 import com.caimei.redis.RedisService;
 import com.google.common.collect.Maps;
@@ -44,7 +46,8 @@ public class NewPageQualitySupplierController extends BaseController {
 
 	@Autowired
 	private RedisService redisService;
-	
+    @Resource
+    private GenerateUtils generateUtils;
 	@ModelAttribute
 	public NewPageQualitySupplier get(@RequestParam(required=false) String id) {
 		NewPageQualitySupplier entity = null;
@@ -56,7 +59,7 @@ public class NewPageQualitySupplierController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	@RequiresPermissions("newhome:newPageQualitySupplier:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(NewPageQualitySupplier newPageQualitySupplier, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -167,7 +170,7 @@ public class NewPageQualitySupplierController extends BaseController {
 		addMessage(redirectAttributes, "保存优质供应商成功");
 		return "redirect:"+Global.getAdminPath()+"/newhome/newPageQualitySupplier/?repage";
 	}
-	
+
 	@RequiresPermissions("newhome:newPageQualitySupplier:delete")
 	@RequestMapping(value = "delete")
 	public String delete(NewPageQualitySupplier newPageQualitySupplier, RedirectAttributes redirectAttributes) {
@@ -212,12 +215,16 @@ public class NewPageQualitySupplierController extends BaseController {
 		return map;
 	}
 
-	/**
-	 * 有数据变动时需要清除缓存
-	 */
-	public void cleanRedisCache() {
-		//首页缓存
-		String homeData = "getHomeData*";
-		redisService.removePattern(homeData);
-	}
-}
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        //首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+        // 重新生成静态首页
+        generateUtils.generateHome();
+
+    }
+}

src/main/java/com/caimei/modules/opensearch/GenerateUtils.java

@@ -0,0 +1,30 @@
+package com.caimei.modules.opensearch;
+
+import com.thinkgem.jeesite.common.config.Global;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * www静态页面生成utils
+ *
+ * @author : Charles
+ * @date : 2021/5/10
+ */
+@Component
+public class GenerateUtils {
+
+    public void generateHome(){
+        // 获取www服务器地址
+        String wwwServer = Global.getConfig("wwwServer");
+        RestTemplate restTemplate = new RestTemplate();
+        MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
+        String uri = wwwServer + "/generate/home";
+        // 发起Post请求
+        String result = restTemplate.postForObject(uri, paramMap, String.class);
+        System.out.println("生成www静态首页：" + result);
+    }
+
+
+}

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/CmPayShopService.java

@@ -160,15 +160,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     Integer returnNum = newOrderProductDao.CountReturnedPurchaseProduct(so.getShopOrderID(), p.getOrderProductID());
                     returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
-                    /*if ( returnNum!=null && returnNum>0 ){
-                        if (p.getPresentNum()>0) {
-                            p.setNum(0);
-                            p.setPresentNum(0);
-                        } else {
-                            p.setNum(p.getNum()-returnNum);
-                        }
-                    }
-                    p.setReturnedNum(returnNum == null ? 0 : returnNum > 0 ? returnNum : 0);*/
                 }
                 so.setNewOrderProducts(orderProductList);
                 so.setWaitPayShop((so.getShouldPayShopAmount() == null ? 0D : so.getShouldPayShopAmount()) - (so.getPayedShopAmount() == null ? 0D : so.getPayedShopAmount()));
@@ -180,6 +171,8 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     if ("2".equals(newOrder.getOrderType())) {
                         //呵呵商城订单
                         so.setOrderType(2);
+                        String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                        so.setClubName(name);
                     }
                 } else {
                     so.setReceiptStatus("1");

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

@@ -627,6 +627,27 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
         //私钥,商户密钥
         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/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -3,6 +3,7 @@ package com.caimei.modules.order.service;
 
 import com.caimei.modules.bulkpurchase.dao.BpOrderUserinfoDao;
 import com.caimei.modules.bulkpurchase.entity.BpOrderUserinfo;
+import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.utils.ProductType;
@@ -65,6 +66,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
     private BpOrderUserinfoDao bpOrderUserinfoDao;
     @Resource
     private CmPromotionDao cmPromotionDao;
+    @Resource
+    private HeHeNewOrderDao heHeNewOrderDao;
 
 
     public List<NewShopOrder> findListByOrderID() {
@@ -269,6 +272,8 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
                 if ("2".equals(newOrder.getOrderType())) {
                     //呵呵商城订单
                     so.setOrderType(2);
+                    String name = heHeNewOrderDao.findHeUser(newOrder.getUserID());
+                    so.setClubName(name);
                 }
             } else {
                 so.setReceiptStatus("1");
@@ -461,6 +466,12 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             order.setReturnedFreightFlag(returnedFreightFlag);
             order.setShouldPayShopAmount(shouldPayShopAmount);
             order.setNewShopOrders(list);
+
+            if ("2".equals(order.getOrderType())) {
+                //呵呵商城订单
+                String name = heHeNewOrderDao.findHeUser(order.getUserID());
+                order.setClubName(name);
+            }
         }
         return page;
     }

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -14,6 +14,7 @@ import com.caimei.modules.product.service.CmSecondHandTransactionService;
 import com.caimei.modules.product.service.ProductNewService;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.po.ProductImage;
+import com.caimei.redis.RedisService;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.Encodes;
@@ -60,6 +61,8 @@ public class CmSecondHandDetailController extends BaseController {
     private ProductNewService productNewService;
     @Autowired
     private ProductNewDao productNewDao;
+    @Autowired
+    private RedisService redisService;
 
     @ModelAttribute
     public CmSecondHandDetail get(@RequestParam(required = false) String id) {
@@ -357,6 +360,8 @@ public class CmSecondHandDetailController extends BaseController {
             redirectAttributes.addAttribute("searchBrandID", cmSecondHandDetail.getSearchBrandID());
             redirectAttributes.addAttribute("searchPreferredFlag", cmSecondHandDetail.getSearchPreferredFlag());
         }
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list?searchProductCategory=2";
     }
 
@@ -402,7 +407,18 @@ public class CmSecondHandDetailController extends BaseController {
     public String delete(CmSecondHandDetail cmSecondHandDetail, RedirectAttributes redirectAttributes) {
         cmSecondHandDetailService.delete(cmSecondHandDetail);
         addMessage(redirectAttributes, "删除成功");
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/cmSecondHandDetail/?repage";
     }
 
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        // 首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+    }
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -12,6 +12,7 @@ import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
 import com.caimei.po.ProductImage;
 import com.caimei.po.ProductLadderPrice;
+import com.caimei.redis.RedisService;
 import com.caimei.utils.AppUtils;
 import com.caimei.vo.JsonModel;
 import com.google.common.collect.Maps;
@@ -69,6 +70,8 @@ public class ProductNewController extends BaseController {
     private CmBrandService cmBrandService;
     @Resource
     private CmSecondHandDetailService cmSecondHandDetailService;
+    @Autowired
+    private RedisService redisService;
 
     @ModelAttribute
     public Product get(@RequestParam(required = false) String id) {
@@ -324,7 +327,6 @@ public class ProductNewController extends BaseController {
         addMessage(redirectAttributes, "保存商品成功");
         // 更新索引
         searchUitls.updateProductIndex(product.getProductID());
-
         String editFlag = product.getEditFlag();
         if (StringUtils.equals("1", editFlag)) {
             redirectAttributes.addAttribute("id", product.getId());
@@ -342,7 +344,8 @@ public class ProductNewController extends BaseController {
             redirectAttributes.addAttribute("searchPreferredFlag", product.getSearchPreferredFlag());
             redirectAttributes.addAttribute("searchProductCategory", product.getSearchProductCategory());
         }
-
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list/";
     }
 
@@ -475,6 +478,8 @@ public class ProductNewController extends BaseController {
         redirectAttributes.addAttribute("searchBrandID", product.getSearchBrandID());
         redirectAttributes.addAttribute("searchPreferredFlag", product.getSearchPreferredFlag());
         redirectAttributes.addAttribute("searchProductCategory", product.getSearchProductCategory());
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list/";
     }
 
@@ -595,6 +600,8 @@ public class ProductNewController extends BaseController {
             map.put("msg", "操作成功");
             // 更新索引
             searchUitls.updateProductIndex(productID);
+            // 有数据变动时需要清除缓存
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -851,6 +858,14 @@ public class ProductNewController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/product/new/recommend?id=" + productID;
     }
 
-
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        // 首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+    }
 }
 

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

@@ -75,11 +75,11 @@
             <if test="id != null and id != '' and id != 0 ">
                 AND a.id = #{id}
             </if>
-            <if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+            <if test="organizeID != null and organizeID != 9999 ">
                 AND cr.organizeID = #{organizeID}
             </if>
-            <if test="organizeID == 0 ">
-                AND (cr.organizeID IS NULL OR cr.organizeID = 2)
+            <if test="organizeID == 9999 ">
+                AND cr.orderType = 2
             </if>
             <if test="startTime != null and startTime != ''">
                 AND (a.receiptDate &gt; #{startTime} OR a.receiptDate = #{startTime})

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

@@ -101,9 +101,12 @@
 			<if test="orderID != null and orderID != ''">
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderID=#{orderID})
 			</if>
-			<if test="organizeID != null and organizeID != ''">
+			<if test='organizeID != null and organizeID != "" and organizeID != "9999"'>
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.organizeID = #{organizeID})
 			</if>
+			<if test='organizeID == "9999"'>
+				AND a.id IN (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderType = 2)
+			</if>
 			<if test="orderNo != null and orderNo != ''">
 				AND a.id in (SELECT cpsr.payShopID FROM cm_pay_shop_record  cpsr LEFT JOIN cm_shop_order so ON so.shopOrderID=cpsr.shopOrderID WHERE so.orderNo LIKE CONCAT('%',#{orderNo},'%'))
 			</if>

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

@@ -38,7 +38,7 @@
 		left join shop s on s.shopID = a.shopID
 		left join sys_user u on u.id = a.operator
 		<where>
-			<if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+			<if test="organizeID != null and organizeID != 9999 and organizeID != 0 ">
 				AND a.id IN (
 				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
 				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
@@ -49,7 +49,14 @@
 				AND a.id IN (
 				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
 				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
-				WHERE organizeID IS NULL or organizeID = 2
+				WHERE organizeID IS NULL or organizeID = 0
+				)
+			</if>
+			<if test="organizeID == 9999 ">
+				AND a.id IN (
+				SELECT DISTINCT crsr.refundShopID FROM cm_refund_shop_record crsr
+				LEFT JOIN cm_shop_order cso ON crsr.shopOrderID=cso.shopOrderID
+				WHERE cso.orderType = 2
 				)
 			</if>
 			<if test="id != null and id != ''">

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"

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

@@ -637,9 +637,12 @@
             <if test="orderID != null and orderID != ''">
                 AND co.orderID = #{orderID}
             </if>
-			<if test="organizeID != null">
+			<if test="organizeID != null and organizeID != 9999">
 				AND co.organizeID = #{organizeID}
 			</if>
+			<if test="organizeID == 9999">
+				AND co.orderType = 2
+			</if>
             <if test="orderNo != null and orderNo != ''">
                 AND co.orderNo like concat('%', #{orderNo} ,'%')
             </if>

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

@@ -770,12 +770,12 @@
             <if test="orderID != null and orderID != ''">
                 AND a.orderID = #{orderID}
             </if>
-            <if test="organizeID != null and organizeID != '' and organizeID != 0 ">
-                AND a.organizeID = #{organizeID}
-            </if>
-            <if test="organizeID == 0 ">
-                AND (a.organizeID IS NULL OR a.organizeID = 2)
+            <if test="organizeID != null and organizeID != 9999">
+                AND co.organizeID = #{organizeID}
             </if>
+			<if test="organizeID == 9999 ">
+				AND co.orderType = 2
+			</if>
             <if test="orderNo != null and orderNo != ''">
                 AND a.orderNo like concat('%', #{orderNo} ,'%')
             </if>

src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp

@@ -143,6 +143,7 @@
             <form:select path="organizeID" class="select-ele input-medium required">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <c:forEach items="${organizeList}" var="organize" varStatus="index">
                     <form:option value="${organize.id}" label="${organize.organizeName}"/>
                 </c:forEach>
@@ -256,7 +257,13 @@
                         <c:if test="${s.organizeID == '1'}">
                             <span class="org-note">星范</span>
                         </c:if>
-                            ${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                            ${s.clubName}
+                        <c:if test="${s.orderType eq 2}">
+                            <font color="red">(呵呵商城)</font>
+                        </c:if>
+                        <c:if test="${s.organizeID == 3}">
+                            <em class="weishaIcon">维沙</em>
+                        </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
                     <td>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -145,6 +145,7 @@
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                               htmlEscape="false"/>
             </form:select>

src/main/webapp/WEB-INF/views/modules/order/cmPayFormList.jsp

@@ -74,6 +74,7 @@
 				<form:select path="organizeID" class="input-medium">
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
+					<form:option value="9999" label="呵呵商城"/>
 					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 								  htmlEscape="false"/>
 				</form:select>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -334,6 +334,7 @@
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="0" label="采美"/>
+                <form:option value="9999" label="呵呵商城"/>
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
             </form:select>
         </div>

src/main/webapp/WEB-INF/views/modules/order/cmRefundRecordList.jsp

@@ -116,6 +116,7 @@
 			<form:select path="organizeID" class="input-medium">
 				<form:option value="" label="请选择"/>
 				<form:option value="0" label="采美"/>
+				<form:option value="9999" label="呵呵商城"/>
 				<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id" htmlEscape="false"/>
 			</form:select>
 		</div>

src/main/webapp/WEB-INF/views/modules/order/cmRefundShopList.jsp

@@ -78,6 +78,7 @@
 				<form:select path="organizeID" class="select-ele input-medium">
 					<form:option value="" label="请选择"/>
 					<form:option value="0" label="采美"/>
+					<form:option value="9999" label="呵呵商城"/>
 					<form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
 								  htmlEscape="false"/>
 				</form:select>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -260,16 +260,16 @@
             <c:if test="${order.discountFee le 0}">¥0.00</c:if>
         </td>
         <td>运费：
-            <c:if test="${order.freight == 0}">
+            <c:if test="${order.freePostFlag == 0}">
                 包邮
             </c:if>
-            <c:if test="${order.freight == -1}">
+            <c:if test="${order.freePostFlag == -1}">
                 到付
             </c:if>
-            <c:if test="${order.freight == -2}">
+            <c:if test="${order.freePostFlag == -2}">
                 仪器到付-产品包邮
             </c:if>
-            <c:if test="${order.freight != -1 && order.freight != 0 && order.freight != -2}">
+            <c:if test="${order.freePostFlag != -1 && order.freePostFlag != 0 && order.freePostFlag != -2}">
                 <fmt:formatNumber value="${order.freight}" type="currency"/>
             </c:if>
         </td>