fix: 微信模板优化

(cherry picked from commit e3a5228a51e73bd60bebd4a7ee309441cb54608c)

fs-service-system/src/main/java/com/fs/store/mapper/FsWechatTemplateMapper.java

@@ -1,20 +1,23 @@
 package com.fs.store.mapper;
 
 import java.util.List;
+import java.util.Set;
+
 import com.fs.store.domain.FsWechatTemplate;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
  * 微信模板Mapper接口
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
-public interface FsWechatTemplateMapper 
+public interface FsWechatTemplateMapper
 {
     /**
      * 查询微信模板
-     * 
+     *
      * @param id 微信模板ID
      * @return 微信模板
      */
@@ -22,7 +25,7 @@ public interface FsWechatTemplateMapper
 
     /**
      * 查询微信模板列表
-     * 
+     *
      * @param fsWechatTemplate 微信模板
      * @return 微信模板集合
      */
@@ -30,7 +33,7 @@ public interface FsWechatTemplateMapper
 
     /**
      * 新增微信模板
-     * 
+     *
      * @param fsWechatTemplate 微信模板
      * @return 结果
      */
@@ -38,7 +41,7 @@ public interface FsWechatTemplateMapper
 
     /**
      * 修改微信模板
-     * 
+     *
      * @param fsWechatTemplate 微信模板
      * @return 结果
      */
@@ -46,7 +49,7 @@ public interface FsWechatTemplateMapper
 
     /**
      * 删除微信模板
-     * 
+     *
      * @param id 微信模板ID
      * @return 结果
      */
@@ -54,7 +57,7 @@ public interface FsWechatTemplateMapper
 
     /**
      * 批量删除微信模板
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -66,4 +69,5 @@ public interface FsWechatTemplateMapper
     List<String> selectFsWechatTemplateIds();
     @Select("select temp_id from fs_wechat_template where find_in_set(tempkey,#{key})")
     List<String> selectFsWechatTemplateIdsByKeys(String key);
+    List<String> selectFsWechatTemplateIdsByKeySet(@Param("items") Set<String> key);
 }

fs-service-system/src/main/resources/mapper/store/FsWechatTemplateMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.store.mapper.FsWechatTemplateMapper">
-    
+
     <resultMap type="FsWechatTemplate" id="FsWechatTemplateResult">
         <result property="id"    column="id"    />
         <result property="tempkey"    column="tempkey"    />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFsWechatTemplateList" parameterType="FsWechatTemplate" resultMap="FsWechatTemplateResult">
         <include refid="selectFsWechatTemplateVo"/>
-        <where>  
+        <where>
             <if test="tempkey != null  and tempkey != ''"> and tempkey = #{tempkey}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
@@ -33,12 +33,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
     </select>
-    
+
     <select id="selectFsWechatTemplateById" parameterType="Integer" resultMap="FsWechatTemplateResult">
         <include refid="selectFsWechatTemplateVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectFsWechatTemplateIdsByKeySet" resultType="java.lang.String">
+        select temp_id from fs_wechat_template where tempkey in
+        <foreach collection="items" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
     <insert id="insertFsWechatTemplate" parameterType="FsWechatTemplate" useGeneratedKeys="true" keyProperty="id">
         insert into fs_wechat_template
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -86,10 +92,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteFsWechatTemplateByIds" parameterType="String">
-        delete from fs_wechat_template where id in 
+        delete from fs_wechat_template where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -29,6 +29,7 @@ import com.fs.store.domain.*;
 import com.fs.store.dto.ExpressDataDTO;
 import com.fs.store.dto.ExpressInfoDTO;
 import com.fs.store.dto.ExpressNotifyDTO;
+import com.fs.store.mapper.FsWechatTemplateMapper;
 import com.fs.store.param.SignParam;
 import com.fs.store.service.*;
 import com.fs.pay.service.IPayService;
@@ -38,6 +39,7 @@ import com.fs.system.oss.OSSFactory;
 import com.fs.system.vo.DictVO;
 import com.fs.system.service.ISysConfigService;
 import com.fs.system.service.ISysDictDataService;
+import com.google.common.collect.Sets;
 import com.hc.openapi.tool.util.Ids;
 import com.tencentyun.TLSSigAPIv2;
 import io.swagger.annotations.Api;
@@ -65,35 +67,31 @@ import java.util.*;
 public class CommonController extends AppBaseController {
 	Logger logger = LoggerFactory.getLogger(CommonController.class);
 	@Autowired
-    JwtUtils jwtUtils;
-	@Autowired
-	private ServerConfig serverConfig;
+	private JwtUtils jwtUtils;
+
 	@Autowired
 	private ISysDictDataService dictDataService;
 
 	@Autowired
 	private ISysConfigService configService;
-	@Autowired
-	IPrescribeService prescribeService;
 
 	@Autowired
-	IFsStoreOrderItemService orderItemService;
+	private IFsStoreOrderItemService orderItemService;
 	@Autowired
-	IFsStoreProductService productService;
+    private IFsStoreProductService productService;
 	@Autowired
-	FSSysConfig fsSysConfig;
-	@Autowired
-	IErpShopService erpShopService;
+	private FSSysConfig fsSysConfig;
+
 	@Autowired
-	IErpUserService userService;
+	private IErpUserService userService;
 	@Autowired
-	IPayService payService;
+	private IPayService payService;
 	@Autowired
-	IErpOrderService erpOrderService;
+	private IErpOrderService erpOrderService;
 	@Autowired
-	IErpGoodsService goodsService;
+	private IErpGoodsService goodsService;
 	@Autowired
-	PayService ybPayService;
+	private PayService ybPayService;
 	@Autowired
 	private IFsWechatTemplateService wechatTemplateService;
 
@@ -119,7 +117,7 @@ public class CommonController extends AppBaseController {
 	@Autowired
 	private IFsCityService cityService;
 	@Autowired
-	IFsStoreOrderService orderService;
+	private IFsStoreOrderService orderService;
 	@Autowired
 	IFsStorePaymentService paymentService;
 //	@ApiOperation("批量推送订单")
@@ -143,42 +141,6 @@ public class CommonController extends AppBaseController {
 		return R.ok().put("data",orderResult);
 	}
 
-
-
-//	@ApiOperation("testGetOrder")
-//	@GetMapping("testGetOrder")
-//	public R testGetOrder(String orderId) throws Exception
-//	{
-//		PayApiServiceImpl payService = new PayApiServiceImpl();
-//		OrderQueryDTO o = new OrderQueryDTO();
-////        o.setLowOrderId("orderWx123456121");
-//		o.setUpOrderId(orderId);
-//		OrderResult order = payService.getOrder(o);
-//
-//		return R.ok().put("data",order);
-//	}
-
-
-//	@ApiOperation("同步企业金额")
-//	@PostMapping("testUpdateCompanyMoney")
-//	public R testUpdateCompanyMoney(@RequestBody TestMoneyParam param) throws Exception
-//	{
-//		List<CompanyMoneyLogs> logs=logsService.selectCompanyMoneyLogsByCompanyId(param.getCompanyId(),param.getLogsId().toString());
-//		if(logs!=null){
-//			BigDecimal companyMoney=param.getMoney();
-//			for(CompanyMoneyLogs log:logs){
-//				companyMoney=companyMoney.add(log.getMoney());
-//				CompanyMoneyLogs logMap=new CompanyMoneyLogs();
-//				logMap.setLogsId(log.getLogsId());
-//				logMap.setBalance(companyMoney);
-//				logsService.updateCompanyMoneyLogs(logMap);
-//			}
-//		}
-//		return R.ok();
-//	}
-
-
-
 	@ApiOperation("testErpDeliverys")
 	@PostMapping("testErpDeliverys")
 	public R testErpDeliverys(@RequestBody  ErpDeliverysRequest request) throws Exception
@@ -235,36 +197,6 @@ public class CommonController extends AppBaseController {
 	}
 
 
-
-
-
-//	@ApiOperation("testTask")
-//	@PostMapping("testTask")
-//	public void testErpGetOrder() throws Exception
-//	{
-//		Set<String> orders=redisTemplate.keys(DELIVERY+":*");
-//		for(String extndOrderId:orders){
-//			String orderCode=(String)redisTemplate.opsForValue().get(extndOrderId);
-//			ErpOrderQueryRequert request=new ErpOrderQueryRequert();
-//			String[] extendOrder=extndOrderId.split(":");
-//			request.setCode(extendOrder[1]);
-//			ErpOrderQueryResponse response=erpOrderService.getOrder(request);
-//			if(response.getOrders()!=null&&response.getOrders().size()>0){
-//				for(ErpOrderQuery orderQuery : response.getOrders()){
-//					if(orderQuery.getDeliverys()!=null&&orderQuery.getDeliverys().size()>0){
-//						//更新商订单状态 删除REDIS
-//						orderService.deliveryOrder(orderCode,orderQuery.getDeliverys().get(0).getMail_no());
-//						redisCache.deleteObject(DELIVERY+":"+extndOrderId);
-//					}
-//				}
-//			}
-//		}
-//
-//	}
-
-
-
-
 	@ApiOperation("testErpGoods")
 	@PostMapping("testErpGoods")
 	public R testErpGoods() throws Exception
@@ -466,10 +398,6 @@ public class CommonController extends AppBaseController {
 
 	}
 
-
-
-
-
 	@Login
 	@GetMapping(value = "/getTlsSig")
 	@ApiOperation("获取腾讯云签名")
@@ -481,49 +409,6 @@ public class CommonController extends AppBaseController {
 	}
 
 
-	//
-	// @ApiOperation("测试开处方")
-	// @PostMapping("/doPrescribe")
-	// public R doPrescribe() throws Exception
-	// {
-	// 	PrescribeParam prescribeParam=new PrescribeParam();
-	// 	List<Prescribe> data=new ArrayList<>();
-	// 	Prescribe prescribe=new Prescribe();
-	// 	prescribe.setRp_id(OrderUtils.getOrderNo());
-	// 	prescribe.setPharmacy_code("00001");
-	// 	prescribe.setPharmacy_name("测试门店");
-	// 	prescribe.setPatient_name("张三");
-	// 	prescribe.setPatient_age(12);
-	// 	prescribe.setPatient_tel("15193190697");
-	// 	prescribe.setPatient_gender("1");
-	// 	prescribe.setIs_history_allergic("否");
-	// 	prescribe.setLiver_unusual("否");
-	// 	prescribe.setRenal_unusual("否");
-	// 	prescribe.setLactation_flag("否");
-	// 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	// 	Date now = new Date();
-	// 	prescribe.setRp_create_time(sdf.format(now));
-	// 	prescribe.setRp_url_type("png");
-	// 	prescribe.setLactation_flag("否");
-	// 	prescribe.setCallback_url(fsSysConfig.getCallbackUrl());
-	// 	data.add(prescribe);
-	//
-	// 	List<Drug> drug_list=new ArrayList<>();
-	// 	Drug drug=new Drug();
-	// 	drug.setDrug_common_name("维力青 恩替卡韦分散片 0.5mg*7片");
-	// 	drug.setDrug_specification("0.5mg*7片");
-	// 	drug.setSale_amount("1");
-	// 	drug.setSale_unit("盒");
-	// 	drug.setApproval_number("000001");
-	// 	drug_list.add(drug);
-	// 	prescribe.setDrug_list(drug_list);
-	// 	prescribeParam.setData(data);
-	//
-	// 	prescribeService.doPrescribe(prescribeParam);
-	// 	return R.ok();
-	// }
-
-
 	@ApiOperation("创建ERP订单")
 	@GetMapping("createErpOrder")
 	public R createErpOrder(@RequestParam("orderCode") String orderCode) throws Exception
@@ -584,7 +469,6 @@ public class CommonController extends AppBaseController {
 
 	@ApiOperation("获取微信模板")
 	@GetMapping("/getWeixinTemps")
-	@Cacheable(value= "temps")
 	public R getWeixinTemps(
 	){
 		List<String> temp=wechatTemplateService.selectFsWechatTemplateIds();
@@ -592,23 +476,24 @@ public class CommonController extends AppBaseController {
 
 	}
 
+	@Autowired
+	private FsWechatTemplateMapper fsWechatTemplateMapper;
 	@ApiOperation("获取微信模板")
 	@GetMapping("/getWeixinOrderTemps")
-	@Cacheable(value= "orderTemps")
 	public R getWeixinOrderTemps(
 	){
-		List<String> temp=wechatTemplateService.selectFsWechatTemplateIdsByKeys("delivery_success,finish_success,cancel_success");
+		Set<String> keys = Sets.newHashSet("delivery_success","finish_success","cancel_success");
+
+		List<String> temp=fsWechatTemplateMapper.selectFsWechatTemplateIdsByKeySet(keys);
 		return R.ok().put("temp",temp);
 
 	}
 	@ApiOperation("获取微信模板")
 	@GetMapping("/getWeixinPrescribeTemps")
-	@Cacheable(value= "prescribetemps")
 	public R getWeixinPrescribeTemps(
 	){
 		List<String> temp=wechatTemplateService.selectFsWechatTemplateIdsByKeys("prescribe");
 		return R.ok().put("temp",temp);
-
 	}