Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/FeedbackInfoDto.java

+package com.upyuns.platform.rs.website.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @ClassName : FeedbackInfoDto
+ * @Description : 反馈信息
+ * @Author : jiaoruizhen
+ * @Date: 2020-12-22 13:51
+ */
+@Data
+public class FeedbackInfoDto extends PageParam {
+
+	Integer type;
+
+	Integer userId;
+
+	String keywords;
+
+}

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ItemInfoDto.java

@@ -13,7 +13,7 @@ public class ItemInfoDto {
 
 	Long id;
 
-	Integer number;
+	Integer number = 1;
 
 	/**
 	 * 类型： 1、标准数据，2、影像图库，3、行业应用信息, 4、购物车确认订单

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/OrderInfoDto.java

@@ -47,6 +47,11 @@ public class OrderInfoDto extends PageParam {
 	 */
 	private String invoiceContent;
 
+	/**
+	 * 订单ID
+	 */
+	Long orderId;
+
 	//详情ID
 	Long detailId;
 

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/UserOrderDto.java

@@ -33,4 +33,19 @@ public class UserOrderDto extends PageParam {
 	//用户id
 	Integer userId;
 
+	/**
+	 * 订单号
+	 */
+	String orderNo;
+
+	/**
+	 * 昵称
+	 */
+	String nickname;
+
+	/**
+	 * 手机号
+	 */
+	String phone;
+
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/FeedbackInfo.java

+package com.upyuns.platform.rs.website.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 反馈信息
+ * 
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-22 13:38:56
+ */
+@Data
+@Table(name = "feedback_info")
+public class FeedbackInfo implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  
+   */
+    @Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@ApiModelProperty("")
+    private Integer id;
+	
+	    /**
+     *  姓名
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "姓名")
+    private String name;
+	
+	    /**
+     *  联系电话
+     */
+    @Column(name = "phone")
+	@ApiModelProperty(value = "联系电话")
+    private String phone;
+	
+	    /**
+     *  内容
+     */
+    @Column(name = "content")
+	@ApiModelProperty(value = "内容")
+    private String content;
+	
+	    /**
+     *  
+     */
+    @Column(name = "order_no")
+	@ApiModelProperty(value = "")
+    private String orderNo;
+	
+	    /**
+     *  
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "", hidden = true )
+    private Date crtTime;
+	
+	    /**
+     *  
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "", hidden = true )
+    private Date updTime;
+	
+	    /**
+     *  
+     */
+    @Column(name = "user_id")
+	@ApiModelProperty(value = "")
+    private Integer userId;
+	
+	    /**
+     *  1、联系客服，2、意见反馈，3、订单反馈
+     */
+    @Column(name = "type")
+	@ApiModelProperty(value = "1、联系客服，2、意见反馈，3、订单反馈")
+    private Integer type;
+	
+
+}

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderInfo.java

@@ -212,6 +212,16 @@ public class OrderInfo implements Serializable {
 	 */
 	String cancelRemark;
 
+	/**
+	 * 定制订单ID
+	 */
+	Integer customerId;
+
+	/**
+	 * 定制信息json
+	 */
+	String customerJson;
+
 	@Transient
 	private List<OrderItem> orderItemList;
 

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/FeedbackInfoBiz.java

+package com.upyuns.platform.rs.website.biz;
+
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.upyuns.platform.rs.website.dto.FeedbackInfoDto;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.upyuns.platform.rs.website.entity.FeedbackInfo;
+import com.upyuns.platform.rs.website.mapper.FeedbackInfoMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 反馈信息
+ *
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-22 13:38:56
+ */
+@Service
+public class FeedbackInfoBiz extends BaseBiz<FeedbackInfoMapper, FeedbackInfo> {
+
+	@Autowired
+	UserFeign userFeign;
+	@Autowired
+	HttpServletRequest request;
+
+
+	public ObjectRestResponse addObj(FeedbackInfo feedbackInfo) {
+		if (feedbackInfo == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		feedbackInfo.setUserId(appUserDTO.getUserid());
+		insertSelectiveRe(feedbackInfo);
+		return ObjectRestResponse.succ();
+	}
+
+
+	public ObjectRestResponse getAll(FeedbackInfoDto feedbackInfoDto) {
+		Query query = new Query(feedbackInfoDto);
+		Example example = new Example(FeedbackInfo.class);
+		Example.Criteria criteria = example.createCriteria();
+		if (feedbackInfoDto.getType() != null) {
+			criteria.andEqualTo("type", feedbackInfoDto.getType());
+		}
+		if (feedbackInfoDto.getUserId() != null) {
+			criteria.andEqualTo("userId", feedbackInfoDto.getUserId());
+		}
+		if (StringUtils.isNotBlank(feedbackInfoDto.getKeywords())) {
+			criteria.andLike("name", "%" + feedbackInfoDto.getKeywords() + "%")
+					.orLike("phone", "%" + feedbackInfoDto.getKeywords() + "%");
+		}
+		PageDataVO<FeedbackInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
+		return ObjectRestResponse.succ(pageDataVO);
+	}
+
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/FeedbackInfoController.java

+package com.upyuns.platform.rs.website.controller;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.FeedbackInfoBiz;
+import com.upyuns.platform.rs.website.dto.FeedbackInfoDto;
+import com.upyuns.platform.rs.website.entity.FeedbackInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("feedbackInfo")
+public class FeedbackInfoController extends BaseController<FeedbackInfoBiz, FeedbackInfo> {
+
+	@GetMapping(value = "getAll")
+	public ObjectRestResponse getAll(FeedbackInfoDto feedbackInfoDto) {
+		return baseBiz.getAll(feedbackInfoDto);
+	}
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

@@ -3,11 +3,12 @@ package com.upyuns.platform.rs.website.controller;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
+import com.upyuns.platform.rs.website.dto.ConfirmReceivedDto;
+import com.upyuns.platform.rs.website.dto.OrderInfoDto;
+import com.upyuns.platform.rs.website.dto.OrderInvoiceDto;
 import com.upyuns.platform.rs.website.dto.UserOrderDto;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("orderInfo")
@@ -22,4 +23,35 @@ public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo>
 	public ObjectRestResponse detail(Long orderId) {
 		return ObjectRestResponse.succ(baseBiz.getOrderDetail(orderId));
 	}
+
+	@PostMapping(value = "orderSend")
+	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.orderSend(confirmReceivedDto);
+	}
+
+	@PostMapping(value = "setInvoice")
+	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.setInvoice(orderInvoiceDto);
+	}
+
+	@PostMapping(value = "invoiceSend")
+	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.invoiceSend(confirmReceivedDto);
+	}
+
+	@GetMapping(value = "customerToOrderInfo")
+	public ObjectRestResponse customerToOrderInfo(Integer customerId) {
+		return baseBiz.customerToOrderInfo(customerId);
+	}
+
+	@PostMapping(value = "setOrderPrice")
+	public ObjectRestResponse setOrderPrice(@RequestBody OrderInfo orderInfo) {
+		return baseBiz.setOrderPrice(orderInfo);
+	}
+
+	@PostMapping(value = "setOrderItem")
+	public ObjectRestResponse setOrderItem(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.setOrderItem(orderInfoDto);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/FeedbackInfoWebController.java

+package com.upyuns.platform.rs.website.controller.web;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.FeedbackInfoBiz;
+import com.upyuns.platform.rs.website.entity.FeedbackInfo;
+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;
+
+@RestController
+@RequestMapping("feedbackInfo/web")
+public class FeedbackInfoWebController extends BaseController<FeedbackInfoBiz,FeedbackInfo> {
+
+	@PostMapping(value = "addObj")
+	public ObjectRestResponse addObj(@RequestBody FeedbackInfo feedbackInfo) {
+		return baseBiz.addObj(feedbackInfo);
+	}
+
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/OrderInfoWebController.java

@@ -41,21 +41,6 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 		return baseBiz.confirmReceived(orderId);
 	}
 
-	@PostMapping(value = "orderSend")
-	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
-		return baseBiz.orderSend(confirmReceivedDto);
-	}
-
-	@PostMapping(value = "setInvoice")
-	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
-		return baseBiz.setInvoice(orderInvoiceDto);
-	}
-
-	@PostMapping(value = "invoiceSend")
-	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
-		return baseBiz.invoiceSend(confirmReceivedDto);
-	}
-
 	@GetMapping(value = "confirmOrderInvoice")
 	public ObjectRestResponse confirmOrderInvoice(Long orderId) {
 		return baseBiz.confirmOrderInvoice(orderId);
@@ -70,4 +55,10 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 	public ObjectRestResponse deleteOrder(Long orderId) {
 		return baseBiz.deleteOrder(orderId);
 	}
+
+	@PostMapping(value = "setAddressOrInvoice")
+	public ObjectRestResponse setAddressOrInvoice(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.setAddressOrInvoice(orderInfoDto);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/FeedbackInfoMapper.java

+package com.upyuns.platform.rs.website.mapper;
+
+import com.upyuns.platform.rs.website.entity.FeedbackInfo;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 反馈信息
+ * 
+ * @author zjw
+ * @email jiaoruizhen@126.com
+ * @date 2020-12-22 13:38:56
+ */
+public interface FeedbackInfoMapper extends Mapper<FeedbackInfo> {
+	
+}

rs-website/rs-website-server/src/main/resources/mapper/FeedbackInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.upyuns.platform.rs.website.mapper.FeedbackInfoMapper">
+
+</mapper>
\ No newline at end of file