submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1253,16 +1253,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public String getGoodsStudyUrl(GoodsStudyUrlBo bo) {
         String url = "";
         //中正学堂PC域名和H5域名 https://zzyxt.gdzzkj.net/  h.gdzzkj.net
-//        String domain = "http://192.168.1.222:6002/";
-//        String domainH5 = "http://120.79.166.78:19006";
-        String domain = "https://zzyxt.gdzzkj.net/";
-        String domainH5 = "https://h.gdzzkj.net";
+        String domain = "http://192.168.1.222:6002/";
+        String domainH5 = "http://120.79.166.78:19006";
+//        String domain = "https://zzyxt.gdzzkj.net/";
+//        String domainH5 = "https://h.gdzzkj.net";
         Long tenantId = 867735392558919680L; //祥粤云
         if (ObjectUtils.isNotNull(bo.getTenantId()) && bo.getTenantId().equals(tenantId)){
-            domain = "https://web.xyyxt.net/";
-            domainH5 = "https://h.xyyxt.net";
-//            domain = "http://192.168.1.222:6002/";
-//            domainH5 = "http://120.79.166.78:19006";
+//            domain = "https://web.xyyxt.net/";
+//            domainH5 = "https://h.xyyxt.net";
+            domain = "http://192.168.1.222:6002/";
+            domainH5 = "http://120.79.166.78:19006";
         }
         Goods goods = baseMapper.queryGoodsByIdTenant(bo.getGoodsId(), bo.getTenantId());
         if (ObjectUtils.isNull(goods)) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -2,10 +2,7 @@ package com.zhongzheng.modules.order.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
-
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -97,4 +94,6 @@ public class OrderAddBo {
     private Integer orderOrg;
     @ApiModelProperty("红包活动码")
     private String shareActivityCode;
+    @ApiModelProperty("业务员名称")
+    private String sellerName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1939,7 +1939,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         record.setUserId(add.getUserId());
         record.setGoodsId(goodsList.get(0).getGoodsId());
         record.setStatus(1);
-        record.setRemark("真题领取活动");
+        record.setRemark(String.format("业务员名称：%s",bo.getSellerName()));
         record.setType(2);
         record.setCreateTime(DateUtils.getNowTime());
         record.setUpdateTime(DateUtils.getNowTime());