Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/bean/coupon/CouponVO.java

@@ -19,6 +19,7 @@ import java.util.Date;
 
 @ApiModel
 @Data
+@ZfireField(tbName = "a")
 public class CouponVO  {
 
 
@@ -26,13 +27,6 @@ public class CouponVO  {
     @ApiModelProperty(value = "优惠券id")
     private String couponId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户")
-    private String companyName;
-
     @ApiModelProperty(value = "优惠券名称")
     private String couponName;
 

src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -44,5 +44,5 @@ public interface CouponDateMapper {
     List<CouponExportBean> exportSelfCoupon(@Param("companyIds")List<String> companyIds,
                                             @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
-    IPage<CouponVO> couponList(Page page, @Param("ex") ZfireParamBean zfireParam);
+    IPage<CouponVO> couponList(Page page, @Param("ex") ZfireParamBean zfireParam,@Param("companyIds")List<String> companyIds,@Param("adminWebsitIds")List<String> adminWebsitIds);
 }

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -37,6 +37,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -244,6 +245,8 @@ public class CouponLogic {
             List<UserCoupon> userCouponList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.SERVICE.toString())
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponCompanyList()),User::getCompanyId, couponBean.getCouponCompanyList().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getWebsitId, couponBean.getCouponWebsitList().stream().map(CouponWebsit::getWebsitId).collect(Collectors.toList()))
                     .list();
             List<CouponUser> couponUserList = new ArrayList<>();
             for (User user : userList) {
@@ -267,6 +270,8 @@ public class CouponLogic {
             List<CouponUser> couponUserList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.GENERAL.toString())
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponCompanyList()),User::getCompanyId, couponBean.getCouponCompanyList().stream().map(CouponCompany::getCompanyId).collect(Collectors.toList()))
+                    .in(CollectionUtils.isNotEmpty(couponBean.getCouponWebsitList()),User::getWebsitId, couponBean.getCouponWebsitList().stream().map(CouponWebsit::getWebsitId).collect(Collectors.toList()))
                     .list();
             for (User user : userList) {
                 CouponUser couponUser = new CouponUser();
@@ -714,9 +719,9 @@ public class CouponLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         //1.组装查询条件
-        FieldUtils.supplyParam(zfireParam, CouponVO.class,adminUser);
+        FieldUtils.supplyParam(zfireParam, CouponVO.class);
 
-        IPage<CouponVO> couponVOIPage = couponDateMapper.couponList(page, zfireParam);
+        IPage<CouponVO> couponVOIPage = couponDateMapper.couponList(page, zfireParam,adminUser.getAdminCompanyIds(),(adminUser.getType().equals(2) || adminUser.getType().equals(4))?adminUser.getAdminWebsitIds():null);
         return couponVOIPage;
     }
 }

src/main/java/com/gree/mall/manager/logic/goods/GoodsApplyLogic.java

@@ -153,6 +153,7 @@ public class GoodsApplyLogic {
         AdminWebsit adminWebsit = adminWebsitService.getById(goodsApplyAddUp.getWebsitId());
 
         goodsApplyAddUp.setCompanyName(adminWebsit.getCompanyName());
+        goodsApplyAddUp.setCompanyId(adminWebsit.getCompanyId());
         goodsApplyAddUp.setWebsitName(adminWebsit.getName());
         goodsApplyAddUp.insert();
 

src/main/java/com/gree/mall/manager/logic/user/MsgSubscriptLogic.java

@@ -34,6 +34,9 @@ public class MsgSubscriptLogic {
     @Autowired
     WechatLogic wechatLogic;
 
+    @Value("${wechat.template}")
+    private String template;
+
 
     /**
      * 发货通知
@@ -72,8 +75,7 @@ public class MsgSubscriptLogic {
             data.put("character_string5", keyword4);
         }
         User user = userService.getById(userId);
-        String template = WxConfiguration.temFhNotice.get(null);
-        String res = sendWxMsg(openId, data, template, "pages/mine/order/detail?orderId="+orderId,null);
+        String res = sendWxMsg(openId, data, template, "pages/mine/order/detail?orderId="+orderId,user.getCompanyId());
         log.info("-----------------完成发货通知消息返回：" + res);
     }
 

src/main/resources/bootstrap-dev.properties

@@ -114,6 +114,8 @@ wechat.mch.key=ZfiretopAdmin20210309GreeAdminSe
 wechat.sub.appid=wxd935838591c00e16
 wechat.sub.secret=a19f2ec72d9e1f0b4f86fac729f6ba81
 wechat.keyPath=classpath:/static/apiclient_cert.p12
+#微信发货模板
+wechat.template=UIqi6nVSi9WLeEFCdtIQKpA_3Ou_DK97JY316zqBj6s
 
 #物流回调
 express.callback = http://121.43.111.127:10003/common/express/callback

src/main/resources/bootstrap-prd.properties

@@ -103,6 +103,9 @@ wechat.sub.appid=wxd935838591c00e16
 wechat.sub.secret=a19f2ec72d9e1f0b4f86fac729f6ba81
 wechat.keyPath=classpath:/static/apiclient_cert.p12
 
+#微信发货模板
+wechat.template=UIqi6nVSi9WLeEFCdtIQKpA_3Ou_DK97JY316zqBj6s
+
 #发票API
 gjmall.url=https://gjmall.zfire.top
 tax.token.appid=zfire

src/main/resources/bootstrap-test.properties

@@ -114,6 +114,8 @@ wechat.mch.key=ZfiretopAdmin20210309GreeAdminSe
 wechat.sub.appid=wxd935838591c00e16
 wechat.sub.secret=a19f2ec72d9e1f0b4f86fac729f6ba81
 wechat.keyPath=classpath:/static/apiclient_cert.p12
+#微信发货模板
+wechat.template=UIqi6nVSi9WLeEFCdtIQKpA_3Ou_DK97JY316zqBj6s
 
 #物流回调
 express.callback = http://121.43.111.127:10003/common/express/callback

src/main/resources/mapper/CouponDateMapper.xml

@@ -241,7 +241,22 @@
         SELECT
         ${ex.selected}
         FROM coupon a
+        join coupon_company cc on cc.coupon_id = a.coupon_id
+        left join coupon_websit cw on cw.coupon_id = a.coupon_id
         ${ex.query}
+        <if test="companyIds != null and companyIds.size > 0">
+            and cc.company_id in
+            <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="adminWebsitIds != null and adminWebsitIds.size > 0">
+            and cw.websit_id in
+            <foreach item="item" index="index" collection="adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by a.coupon_id
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>

src/main/resources/mapper/CustomGoodsApplyMapper.xml

@@ -9,6 +9,12 @@
         FROM goods_apply a
         join goods b on a.goods_id= b.goods_id
         ${ex.query}
+        <if test="ex.companyIds != null and ex.companyIds.size > 0">
+            and a.company_id in
+            <foreach item="item" index="index" collection="ex.companyIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>

src/main/resources/mapper/CustomGoodsMapper.xml

@@ -16,16 +16,16 @@
         t2.bar_code
         FROM
         goods t1
-        join goods_company t4 on t1.goods_id = t4.goods_id
         left join goods_spec t2 on t1.goods_id = t2.goods_id         and t2.del = 0
         left join goods_category t3 on t3.category_id = t1.category_id
         WHERE
         t1.del = 0
-        <if test='companyWechatId != null and companyWechatId.size > 0' >
-            AND t4.company_id  in
-            <foreach collection="companyWechatId" open="(" close=")" item="item" separator=",">
-                #{item}
+        <if test=' companyWechatId != null and companyWechatId.size > 0' >
+            AND  t1.goods_id in (select b.goods_id from goods_company b where b.company_id in
+            <foreach collection="companyWechatId" open="(" close=")" item="companyWechatId" separator=",">
+                #{companyWechatId}
             </foreach>
+            )
         </if>
         <if test='goodsTypes != null and goodsTypes.size > 0' >
             AND t1.goods_type  in
@@ -99,15 +99,16 @@
 
     <select id="countByType" resultType="com.gree.mall.manager.bean.goods.GoodsTypeCount">
         select count(1) 'total', sum(if(status = true, 1, 0)) 'csz', sum(if(status = false, 1, 0)) 'ckz'
-        from goods a join goods_company b on a.goods_id = b.goods_id
+        from goods a
         where del = false
         <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-            AND b.company_id in
+            AND  a.goods_id in (select b.goods_id from goods_company b where b.company_id in
             <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                 #{companyWechatId}
             </foreach>
+            )
         </if>
-        group by a.goods_id
+
     </select>
 
     <select id="ysq" resultType="java.lang.Integer">

src/main/resources/mapper/OrderShareReportMapper.xml

@@ -62,7 +62,6 @@
 
     <select id="queryReport2" resultType="com.gree.mall.manager.bean.order.OrderShareReportBean">
         select
-        acw.min_app_name as shopName,
         os.order_share_id as orderShareId,
         os.order_id as orderId,
         oi.total_product_amount as totalPrice,
@@ -97,16 +96,16 @@
         oi.transaction_id as transactionId,
         os.status as shareStatus ,
         os.work_user_name as workUserName,
-        aw.name as websitName,
+        os.websit_id,
         os.amount as amount,
-        os.settle_time as settleTime,
-        eww.position as position
+        os.settle_time as settleTime
+
 
         from order_share os
         left join order_info oi  on os.order_id = oi.order_id
         left JOIN order_tax ot on oi.order_id = ot.order_id
-        left join admin_company_wechat acw on os.company_wechat_id = acw.company_wechat_id
-        left JOIN admin_websit aw on eww.main_department = aw.websit_id
+
+
         left JOIN express_company ec on ec.code = oi.company_code
         where os.order_share_id in
         <foreach item="item" index="index" collection="orderShareIdList" open="(" separator=","