feat:购物车修改和websocket配置修改

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/AddReviewDto.java

@@ -26,7 +26,7 @@ public class AddReviewDto {
     /**
      * 评论图片
      */
-    private List<String> image;
+    private List<FIleDto> image;
 
     /**
      * 商品ID
@@ -42,4 +42,9 @@ public class AddReviewDto {
      * 评级1-5
      */
     private Integer rating;
+
+    /**
+     * 是否匿名 0 否 1是
+     */
+    private Integer isAnonymity;
 }

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/OpinionTypeVo.java

@@ -0,0 +1,22 @@
+package edu.travel.remote.vo;
+
+import lombok.Data;
+
+@Data
+public class OpinionTypeVo {
+    /**
+     * 意见类型ID
+     */
+    private String id;
+
+    /**
+     * 类型名
+     */
+    private String typeName;
+
+    /**
+     * 类型描述
+     */
+    private String typeDescription;
+
+}

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopCartListVo.java

@@ -69,4 +69,9 @@ public class ShopCartListVo {
      */
     private String state;
 
+    /**
+     * 商品状态 0 上架 1 下架
+     */
+    private String productState;
+
 }

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopReviewVo.java

@@ -1,6 +1,7 @@
 package edu.travel.remote.vo;
 
 import edu.travel.entity.BaseEntity;
+import edu.travel.remote.dto.FIleDto;
 import lombok.Data;
 
 import java.util.List;
@@ -61,9 +62,14 @@ public class ShopReviewVo extends BaseEntity {
     /**
      * 图片集合
      */
-    private List<String> imageUrls;
+    private List<FIleDto> imageUrls;
     /**
      * 是否置顶
      */
     private String isTop;
+
+    /**
+     * 状态
+     */
+    private Integer isAnonymity;
 }

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/dto/ShowOrderInfoDto.java

@@ -12,5 +12,5 @@ public class ShowOrderInfoDto extends PagePO {
     /**
      * 国家id
      */
-    private String CountryId;
+    private String countryId;
 }

edu-travel-remote/edu-travel-remote-order/src/main/java/edu/travel/remote/vo/OrderStateVo.java

@@ -0,0 +1,35 @@
+package edu.travel.remote.vo;
+
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class OrderStateVo {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 订单号
+     */
+    private String orderId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 0 待付款 1 已下单代发货 2 待收货 3 已完成 4已取消
+     */
+    private Integer status;
+    /**
+     * 操作时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date createTime;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopReview.java

@@ -83,4 +83,10 @@ public class ShopReview extends BaseEntity {
     @TableField(value = "sku_details")
     private String skuDetails;
 
+    /**
+     * 是否匿名0否  1是
+     */
+    @TableField(value = "is_anonymity")
+    private Integer isAnonymity;
+
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopReviewServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -21,6 +23,7 @@ import edu.travel.commodity.mapper.ShopReviewMapper;
 import edu.travel.commodity.service.ShopReviewService;
 import edu.travel.commodity.utils.*;
 import edu.travel.remote.dto.AddReviewDto;
+import edu.travel.remote.dto.FIleDto;
 import edu.travel.remote.dto.GetOrderItemDto;
 import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.exception.BaseException;
@@ -75,15 +78,18 @@ public class ShopReviewServiceImpl extends ServiceImpl<ShopReviewMapper, ShopRev
             users.put(datum.getId(), datum);
         }
         for (ShopReviewVo record : records) {
-            List<String> list = StringUtil.toList(record.getImage());
+            JSONArray objects = JSONUtil.parseArray(record.getImage());
+            List<FIleDto> list = JSONUtil.toList(objects, FIleDto.class);
             record.setImageUrls(list);
             if(!ObjectUtil.isEmpty(record.getSkuDetails())){
                 String jsonPrettyStr = JSONUtil.toJsonPrettyStr(record.getSkuDetails());
                 List<SpecOneVo> list1 = JSONUtil.toList(jsonPrettyStr, SpecOneVo.class);
                 record.setSpecOneVo(list1);
             }
-            EduTenantVo eduTenantVo = users.get(record.getUserId());
-            record.setEduTenantVo(eduTenantVo);
+            if(record.getIsAnonymity()!=1){
+                EduTenantVo eduTenantVo = users.get(record.getUserId());
+                record.setEduTenantVo(eduTenantVo);
+            }
         }
         return pageEntity;
     }
@@ -111,8 +117,8 @@ public class ShopReviewServiceImpl extends ServiceImpl<ShopReviewMapper, ShopRev
         }
         ShopReview bean = BeanUtil.toBean(params, ShopReview.class);
         bean.setUserId(Long.valueOf(userId));
-        String image = StringUtil.toListString(params.getImage());
-        bean.setImage(image);
+        String jsonStr1 = JSONUtil.toJsonStr(params.getImage());
+        bean.setImage(jsonStr1);
         //获取商品sku快照 SpecOneVo JSON
         GetOrderItemDto getOrderItemDto = new GetOrderItemDto();
         getOrderItemDto.setOrderId(params.getOrderId());

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopShoppingCartServiceImpl.java

@@ -108,6 +108,7 @@ public class ShopShoppingCartServiceImpl extends ServiceImpl<ShopShoppingCartMap
         for (ShopCartListVo record : records) {
             ShopProduct shopProduct = map.get(record.getProductId());
             if(ObjectUtil.isNotEmpty(shopProduct)){
+                record.setProductState(shopProduct.getStatus().toString());
                 record.setProductName(shopProduct.getProductName());
                 record.setDescription(shopProduct.getDescription());
                 ShopProductSku shopProductSku = productSkuMap.get(record.getProductSkuId());
@@ -142,7 +143,10 @@ public class ShopShoppingCartServiceImpl extends ServiceImpl<ShopShoppingCartMap
             cart.setQuantity(params.getQuery());
         }
         if(!ObjectUtil.isEmpty(params.getSkuId())){
-            cart.setProductSkuId(Long.valueOf(params.getSkuId()));
+            LambdaQueryWrapper<ShopProductSku> query = Wrappers.<ShopProductSku>lambdaQuery().eq(ShopProductSku::getProductId, cart.getProductId())
+                    .eq(ShopProductSku::getSkuId, params.getSkuId());
+            ShopProductSku one = shopProductSkuService.getOne(query);
+            cart.setProductSkuId(one.getId());
         }
         return updateById(cart);
     }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopOpinionTypeController.java

@@ -1,10 +1,13 @@
 package edu.travel.commodity.web;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import edu.travel.commodity.entity.ShopOpinionType;
 import edu.travel.commodity.service.ShopOpinionTypeService;
 import edu.travel.remote.dto.ShopOpinionTypeDto;
 import edu.travel.remote.opinion.ShopOpinionTypeRemoteController;
+import edu.travel.remote.vo.OpinionTypeVo;
 import edu.travel.remote.vo.ShopOpinionTypeVo;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.web.BaseController;
@@ -28,6 +31,17 @@ public class ShopOpinionTypeController extends BaseController<ShopOpinionType> i
 */
 @Autowired
 private ShopOpinionTypeService shopOpinionTypeService;
+
+    /**
+     *  根据语言ID查询意见类型
+     */
+    @GetMapping("/getType")
+    public RPCBaseResponse<List<OpinionTypeVo>> getType(@RequestParam("languageId") String languageId) {
+        LambdaQueryChainWrapper<ShopOpinionType> list = shopOpinionTypeService.lambdaQuery().eq(ShopOpinionType::getLanguageId, languageId)
+                .orderByDesc(ShopOpinionType::getCreateTime);
+        return RPCBaseResponse.success(BeanUtil.copyToList(list.list(), OpinionTypeVo.class));
+    }
+
     /**
      * 连表查询意见类型
      */

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopReviewMapper.xml

@@ -20,10 +20,11 @@
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="image" jdbcType="VARCHAR" property="image" />
     <result column="is_top" jdbcType="INTEGER" property="isTop" />
+    <result column="is_anonymity" jdbcType="INTEGER" property="isAnonymity" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, parent_id, user_id, product_id, sku_id, rating, content, project, create_time, order_id,
-    create_user_id, update_time, update_user_id, delete_flag,image,is_top
+    create_user_id, update_time, update_user_id, delete_flag,image,is_top,is_anonymity
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-order/src/main/java/edu/travel/order/controller/ShopOrderTypeChangeController.java

@@ -4,13 +4,13 @@ import edu.travel.order.entity.ShopOrderTypeChange;
 import edu.travel.order.service.ShopOrderTypeChangeService;
 import edu.travel.remote.dto.AddOrderLogDto;
 import edu.travel.remote.order.ShopOrderTypeChangeRemoteController;
+import edu.travel.remote.vo.OrderStateVo;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 import static edu.travel.rpc.RPCBaseResponse.success;
 
@@ -21,10 +21,26 @@ public class ShopOrderTypeChangeController extends BaseController<ShopOrderTypeC
     private ShopOrderTypeChangeService shopOrderTypeChangeService;
 
 
+    /**
+     *  新增订单日志
+     * @param params
+     * @return {@link RPCBaseResponse }<{@link Void }>
+     */
     @Override
     @PostMapping("/addOrderLog")
     public RPCBaseResponse<Void> addOrderLog(@RequestBody AddOrderLogDto params) {
         shopOrderTypeChangeService.addOrderLog(params);
         return success();
     }
+
+    /**
+     *  查询订单状态流程
+     * @param orderNum
+     * @return {@link RPCBaseResponse }<{@link Void }>
+     */
+    @GetMapping("/getOrderStateByOrderNum")
+    public RPCBaseResponse<List<OrderStateVo>> getOrderStateByOrderNum(@RequestParam("orderNum") String orderNum) {
+        return success(shopOrderTypeChangeService.getOrderStateByOrderNum(orderNum));
+    }
+
 }

edu-travel-service/edu-travel-service-order/src/main/java/edu/travel/order/service/ShopOrderTypeChangeService.java

@@ -3,9 +3,14 @@ package edu.travel.order.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import edu.travel.order.entity.ShopOrderTypeChange;
 import edu.travel.remote.dto.AddOrderLogDto;
+import edu.travel.remote.vo.OrderStateVo;
+
+import java.util.List;
 
 public interface ShopOrderTypeChangeService extends IService<ShopOrderTypeChange> {
 
 
     void addOrderLog(AddOrderLogDto params);
+
+    List<OrderStateVo> getOrderStateByOrderNum(String orderNum);
 }

edu-travel-service/edu-travel-service-order/src/main/java/edu/travel/order/service/impl/ShopOrderTypeChangeServiceImpl.java

@@ -6,8 +6,11 @@ import edu.travel.order.entity.ShopOrderTypeChange;
 import edu.travel.order.mapper.ShopOrderTypeChangeMapper;
 import edu.travel.order.service.ShopOrderTypeChangeService;
 import edu.travel.remote.dto.AddOrderLogDto;
+import edu.travel.remote.vo.OrderStateVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ShopOrderTypeChangeServiceImpl extends ServiceImpl<ShopOrderTypeChangeMapper, ShopOrderTypeChange> implements ShopOrderTypeChangeService {
 
@@ -16,4 +19,11 @@ public class ShopOrderTypeChangeServiceImpl extends ServiceImpl<ShopOrderTypeCha
         ShopOrderTypeChange bean = BeanUtil.toBean(params, ShopOrderTypeChange.class);
         save(bean);
     }
+
+    @Override
+    public List<OrderStateVo> getOrderStateByOrderNum(String orderNum) {
+        List<ShopOrderTypeChange> list = lambdaQuery().eq(ShopOrderTypeChange::getOrderId, orderNum)
+                .orderByDesc(ShopOrderTypeChange::getCreateTime).list();
+        return BeanUtil.copyToList(list, OrderStateVo.class);
+    }
 }

edu-travel-service/edu-travel-service-ws/pom.xml

@@ -127,9 +127,67 @@
             <artifactId>edu-travel-common-constant</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
-
-
-
     </dependencies>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <env>dev</env>
+                <versionCode>${version}-SNAPSHOT</versionCode>
+                <spark.compiler.score>compile</spark.compiler.score>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <env>prod</env>
+                <versionCode>${version}</versionCode>
+                <spark.compiler.score>provided</spark.compiler.score>
+            </properties>
+        </profile>
+    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <delimiters>@</delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
+            <!-- 打包插件 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!-- maven 打包时跳过测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!--开启过滤，用指定的参数替换directory下的文件中的参数-->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
 </project>

edu-travel-service/edu-travel-service-ws/src/main/java/edu/travel/WsApplication.java

@@ -1,6 +1,7 @@
 package edu.travel;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
@@ -12,6 +13,6 @@ public class WsApplication
 {
     public static void main( String[] args )
     {
-        System.out.println( "Hello World!" );
+        SpringApplication.run(WsApplication.class, args);
     }
 }

edu-travel-service/edu-travel-service-ws/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,24 @@
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        namespace: zhangwei-@env@
+      config:
+        file-extension: yaml
+        server-addr: 192.168.1.44:8848,192.168.1.44:8849,192.168.1.44:8858
+        refresh-enabled: true
+        namespace: zhangwei-@env@
+        shared-configs:
+          - data-id: mybatis-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: reids-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: datasource-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: system-config-dev.yaml
+            group: DEFAULT_GROUP
+            refresh: true

edu-travel-service/edu-travel-service-ws/src/main/resources/bootstrap.yml

@@ -0,0 +1,9 @@
+server:
+  port: 16666
+spring:
+  application:
+    name: websocket-@env@
+  profiles:
+    active: @env@
+  main:
+    allow-bean-definition-overriding: true