Merge remote-tracking branch 'origin/master_exclusive_shop_20250718' into master_exclusive_shop_20250718

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="item">
+            #{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

@@ -30,6 +30,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;
@@ -39,6 +40,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;
@@ -67,40 +69,77 @@ import java.util.concurrent.TimeUnit;
 public class CommonController extends AppBaseController {
 	Logger logger = LoggerFactory.getLogger(CommonController.class);
 	@Autowired
-	private JwtUtils jwtUtils;
-
+    private JwtUtils jwtUtils;
+	@Autowired
+	private ServerConfig serverConfig;
 	@Autowired
 	private ISysDictDataService dictDataService;
 
 	@Autowired
 	private ISysConfigService configService;
-
 	@Autowired
-	private FSSysConfig fsSysConfig;
+	private IPrescribeService prescribeService;
 
 	@Autowired
-	private IErpUserService userService;
+	private IFsStoreOrderItemService orderItemService;
+	@Autowired
+    private IFsStoreProductService productService;
+	@Autowired
+    private FSSysConfig fsSysConfig;
+	@Autowired
+    private IErpShopService erpShopService;
 	@Autowired
-	private IPayService payService;
+    private IErpUserService userService;
 	@Autowired
-	private IErpOrderService erpOrderService;
+    private IPayService payService;
 	@Autowired
-	private IErpGoodsService goodsService;
+    private IErpOrderService erpOrderService;
 	@Autowired
-	private PayService ybPayService;
+    private IErpGoodsService goodsService;
+	@Autowired
+    private PayService ybPayService;
 	@Autowired
 	private IFsWechatTemplateService wechatTemplateService;
 
+
 	@Autowired
-	private RedisCache redisCache;
-	@Autowired
-	private IFsCityService cityService;
+	private RedisTemplate redisTemplate;
+
 	@Autowired
-	private IFsStoreOrderService orderService;
+	private FSSysConfig sysConfig;
+
 	@Autowired
-	private IFsProjectAddressConfigService projectAddressConfigService;
+	private IFsExpressService expressService;
 
+	@Autowired
+	private ICompanyService companyService;
 
+	@Autowired
+	ICompanyUserService companyUserService;
+	@Autowired
+	ICompanyMoneyLogsService logsService;
+	@Autowired
+	private IFsStoreOrderItemService storeOrderItemService;
+	@Autowired
+	private IFsCityService cityService;
+	@Autowired
+	IFsStoreOrderService orderService;
+	@Autowired
+	IFsStorePaymentService paymentService;
+    @Autowired
+    private IFsProjectAddressConfigService projectAddressConfigService;
+
+    //	@ApiOperation("批量推送订单")
+//	@GetMapping("pushOms")
+//	public R pushOms(String startTime) throws Exception
+//	{
+//		List<Long> ids=orderService.selectFsStoreOrderToPushByIds(startTime);
+//		for(Long id:ids){
+//			orderService.createOmsOrder(id);
+//		}
+//		return R.ok();
+//
+//	}
 	@ApiOperation("支付手动通知")
 	@GetMapping("payNotify")
 	public R payNotify(String payCode) throws Exception
@@ -439,7 +478,6 @@ public class CommonController extends AppBaseController {
 
 	@ApiOperation("获取微信模板")
 	@GetMapping("/getWeixinTemps")
-	@Cacheable(value= "temps")
 	public R getWeixinTemps(
 	){
 		List<String> temp=wechatTemplateService.selectFsWechatTemplateIds();
@@ -447,23 +485,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");
+		List<String> temp=fsWechatTemplateMapper.selectFsWechatTemplateIdsByKeySet(Sets.newHashSet("prescribe"));
 		return R.ok().put("temp",temp);
-
 	}