新订单消息

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/DistributionOrderNoticeMsg.java

+package com.wwdz.ch.wx.entity;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DistributionOrderNoticeMsg implements Entity {
+
+    private String openId;
+
+    private String templetId;
+
+    /**
+     * 分销订单号
+     */
+    private String distributionOrderId;
+
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 商品名称
+     */
+    private String itemName;
+
+    /**
+     * 商品数量
+     */
+    private Integer itemNum;
+
+    /**
+     * 付款金额
+     */
+    private String amount;
+
+
+    /**
+     * 支付截止时间
+     */
+    private Date payEndTime;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 利润
+     */
+    private String profit;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+
+}
+
+

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

@@ -23,6 +23,7 @@ import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.wwdz.ch.wx.api.WxAppletApi;
 import com.wwdz.ch.wx.entity.AuctionOfferNoticeMsg;
 import com.wwdz.ch.wx.entity.DeliveryNoticeMsg;
+import com.wwdz.ch.wx.entity.DistributionOrderNoticeMsg;
 import com.wwdz.ch.wx.entity.SignedNoticeMsg;
 import com.wwdz.ch.wx.entity.vo.distribution.DistributionOrderDetailVo;
 import com.wwdz.ch.wx.entity.vo.distribution.DistributionOrderVo;
@@ -477,6 +478,28 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributorProfit.setCreateTime(new Date());
             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);
@@ -697,7 +720,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 //发送给卖家
                 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 {
                     logger.info(">>>>> 分销商id :{}, 获取openid失败 <<<<<", distributionOrder.getSellerId());

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

@@ -705,7 +705,51 @@ public class SendMsgServiceImpl implements SendMsgService {
     }
 
     @Override
-    public Result newOrderNoticeMsg(FollowFansMsg followFansMsg) {
-        return null;
+    public Result newOrderNoticeMsg(DistributionOrderNoticeMsg distributionOrderNoticeMsg) {
+        try {
+            String openId = distributionOrderNoticeMsg.getOpenId();
+            String token = officialAccountApi.getAccessToken();
+            String url = "SEND_MSG_URL" + "?access_token=" + token;
+            OkHttpUtil okHttpUtil = OkHttpUtil.builder().url(url);
+            Map<String, Object> map = new HashMap<>();
+            map.put("touser", openId);
+            map.put("template_id", "X38RkH7DtKNDHUMa2P6XXqrEmkHIEvbpTWTr7Mkf2fM");
+            Map<String, Object> miniprogramMap = new HashMap<>();
+            miniprogramMap.put("appid", APPLET_APPID);
+            StringBuffer stringBuffer = new StringBuffer("/pages/saleOrder/index");
+            stringBuffer.append("?shopState=2");
+            miniprogramMap.put("pagepath", stringBuffer.toString());
+            map.put("miniprogram", miniprogramMap);
+            Map<String, Object> paramMap = new LinkedHashMap<>();
+            paramMap.put("thing6", new HashMap() {{
+                put("value", distributionOrderNoticeMsg.getItemName());
+            }});
+            paramMap.put("number8", new HashMap() {{
+                put("value", distributionOrderNoticeMsg.getItemNum());
+            }});
+            paramMap.put("amount12", new HashMap() {{
+                put("value", distributionOrderNoticeMsg.getAmount());
+            }});
+            paramMap.put("time14", new HashMap() {{
+                put("value", DateUtils.toString(distributionOrderNoticeMsg.getCreateTime()));
+            }});
+            map.put("data", paramMap);
+            logger.info("============ 发送新订单通知模板消息内容 : {}", JsonUtils.fromMap(map));
+            okHttpUtil.addParams(map);
+            okHttpUtil.post(true);
+            String responseStr = okHttpUtil.async();
+            logger.info("openid : {}, 发送新订单通知模板消息 response :{}", openId, responseStr);
+            String errorCode = JsonUtils.getValueByPath(responseStr, "errcode");
+            String errmsg = JsonUtils.getValueByPath(responseStr, "errmsg");
+            if (!"0".equals(errorCode)) {
+                logger.error("openid : {}, 发送新订单通知模板消息, errorCode : {}, errmsg : {} ", openId, errorCode, errmsg);
+                return Result.failed();
+            }
+            logger.info("=============发送新订单通知模板消息 成功 ===========");
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("发送新订单通知模板消息 error :{}", e);
+        }
+        return Result.failed();
     }
 }

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

@@ -574,7 +574,11 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             }
             supplierItem.setSort(1);
             supplierItem.setBuyLimitNum(-1);
+            if (dto.getIsOnSale()) {
                 supplierItem.setStock(dto.getStock());
+            } else {
+                supplierItem.setStock(1);
+            }
             supplierItem.setIsOnSale(dto.getIsOnSale());
             Date now = new Date();
             supplierItem.setCreateTime(now);

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/SendMsgService.java

@@ -78,7 +78,7 @@ public interface SendMsgService {
      * 通知被关注者
      * @return
      */
-    Result newOrderNoticeMsg(FollowFansMsg followFansMsg);
+    Result newOrderNoticeMsg(DistributionOrderNoticeMsg distributionOrderNoticeMsg);
 
 
     String getOpenIdByUserId(long userId);