支付成功发送模板消息

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -19,6 +19,8 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private String searchParam;
 
+    private Long userId;
+
     /**
      * 分销分享记录id
      */

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -79,6 +79,9 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
     public int updateStock(long itemId, int stock) {
         SupplierItem supplierItem = new SupplierItem();
         supplierItem.setStock(stock);
+        if (stock <= 0) {
+            supplierItem.setIsOnSale(false);
+        }
         SupplierItemExample supplierItemExample = new SupplierItemExample();
         SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
         criteria.andIdEqualTo(itemId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -479,27 +479,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributorProfit.setIsValid(false);
             distributorProfitDao.insert(distributorProfit);
 
-            //给藏家发信息
-            String lastOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getSellerId());
-            if (com.xxdxxs.utils.StringUtils.hasLength(lastOpenId)) {
-                DistributionOrderNoticeMsg distributionOrderNoticeMsg = new DistributionOrderNoticeMsg();
-                distributionOrderNoticeMsg.setOpenId(lastOpenId);
-                distributionOrderNoticeMsg.setItemId(supplierItem.getId());
-                distributionOrderNoticeMsg.setItemName(supplierItem.getName());
-                distributionOrderNoticeMsg.setItemNum(distributionOrder.getItemNum());
-                distributionOrderNoticeMsg.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
-                distributionOrderNoticeMsg.setCreateTime(distributionOrder.getCreateTime());
-                Result result = sendMsgService.newOrderNoticeMsg(distributionOrderNoticeMsg);
-                if (!result.getSuccess()) {
-                    String url = wxAppletApi.getUrlLink("/pages/saleOrder/index","shopState=2");
-                    String msg = "您的藏馆收到一个新订单,请前往" + url + "查看";
-                    aliSmsSender.sendSms(distributionOrder.getSellerId(), msg);
-                }
-            } else {
-                String url = wxAppletApi.getUrlLink("/pages/saleOrder/index","shopState=2");
-                String msg = "您的藏馆收到一个新订单,请前往" + url + "查看";
-                aliSmsSender.sendSms(distributionOrder.getSellerId(), msg);
-            }
+
             return Result.success(map);
         } catch (Exception e) {
             logger.error("创建藏品一口价订单失败 error : {}", e);
@@ -718,17 +698,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 deliveryNoticeMsg.setDeliveryTime(now);
 
                 //发送给卖家
-                String sellerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getSellerId());
-                if (com.xxdxxs.utils.StringUtils.hasLength(sellerOpenId)) {
-                    if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
-                        deliveryNoticeMsg.setShopState(2);
+                if (dto.getUserId() == null || distributionOrder.getSellerId().longValue() != dto.getUserId()) {
+                    String sellerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getSellerId());
+                    if (com.xxdxxs.utils.StringUtils.hasLength(sellerOpenId)) {
+                        if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
+                            deliveryNoticeMsg.setShopState(2);
+                        } else {
+                            deliveryNoticeMsg.setShopState(1);
+                        }
+                        sendMsgService.sendDeliveryTempletMsg(sellerOpenId, deliveryNoticeMsg);
                     } else {
-                        deliveryNoticeMsg.setShopState(1);
+                        logger.info(">>>>> 卖家id :{}, 获取openid失败 <<<<<", distributionOrder.getSellerId());
                     }
-                    sendMsgService.sendDeliveryTempletMsg(sellerOpenId, deliveryNoticeMsg);
-                } else {
-                    logger.info(">>>>> 分销商id :{}, 获取openid失败 <<<<<", distributionOrder.getSellerId());
                 }
+
                 //发送给买家
                 String buyerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getBuyerId());
                 if (com.xxdxxs.utils.StringUtils.hasLength(buyerOpenId)) {