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

rs-universal/rs-universal-server/src/main/java/com/upyuns/platform/rs/universal/biz/OrderPayBiz.java

@@ -54,7 +54,7 @@ import static com.upyuns.platform.rs.universal.constant.DictionaryKey.UNIVERSAL_
  */
 @Service
 @Slf4j
-public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
+public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
 
 	@Autowired
 	DictionaryBiz dictionaryBiz;
@@ -131,7 +131,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				insertSelective(orderPay);
 				log.error("---下单---order_no=====" + order_no + "----成功");
 			} catch (Exception e) {
-                log.error(e.getMessage(), e);;
+				log.error(e.getMessage(), e);
+				;
 				log.error("---下单---order_no=====" + order_no + "----异常---msg===" + e.getMessage());
 				return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
 			}
@@ -190,7 +191,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				String url = pay.getNotifyUrl();
 				Integer type = pay.getType() == null ? 1 : pay.getType();
 				Integer payWay = pay.getPayWay();
-                url += "&tradeNo=" + orderNo + "&type=" + type+"&payWay="+payWay;
+				url += "&tradeNo=" + orderNo + "&type=" + type + "&payWay=" + payWay;
 				log.error("---支付回调处理---orderNo=======" + orderNo + "----notifyUrl====" + url);
 				String result = "";
 				if (url.contains("https") || url.contains("HTTPS")) {
@@ -260,6 +261,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		}
 		return ObjectRestResponse.createDefaultFail().getMessage();
 	}
+
 	/**
 	 * 支付宝生成支付信息
 	 *
@@ -271,13 +273,15 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayClient alipayClient = getAlipayClient();
 		//实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
 		try {
-            return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
+			return preCreate(alipayClient, orderPayVo, notifyUrl);
 		} catch (Exception e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+			;
 		}
 		return null;
 	}
 
+
 	private AlipayClient getAlipayClient() {
 		AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
 				SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
@@ -320,7 +324,31 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 			log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
 			return response.getBody();
 		} catch (AlipayApiException e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+
+	/**
+	 * 扫码支付
+	 *
+	 * @return
+	 */
+	private String preCreate(AlipayClient alipayClient, OrderPayVo orderPayVo, String notifyUrl) {
+        BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest(); //创建API对应的request类
+		request.setBizContent("{" +
+				"\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"," + //商户订单号
+				"\"total_amount\":\""+realAmount+"\"," +
+				"\"subject\":\"" + orderPayVo.getSubject() + "\"," +
+				"\"timeout_express\":\"30m\"}"); //订单允许的最晚付款时间
+        try {
+            AlipayTradePrecreateResponse response = alipayClient.execute(request);
+            log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
+            return response.getBody();
+        } catch (AlipayApiException e) {
+            log.error(e.getMessage(), e);
         }
         return null;
     }
@@ -377,7 +405,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 	 * @param alipayClient
 	 * @throws AlipayApiException
 	 */
-    public String alipayfundTrans(AlipayClient alipayClient, FundPayVo fundPayVo){
+	public String alipayfundTrans(AlipayClient alipayClient, FundPayVo fundPayVo) {
 		AlipayFundTransToaccountTransferRequest request = new AlipayFundTransToaccountTransferRequest();
 		request.setBizContent("{" +
 				"\"out_biz_no\":\"" + fundPayVo.getOutBizNo() + "\"," +
@@ -391,43 +419,44 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		try {
 			response = alipayClient.execute(request);
 		} catch (AlipayApiException e) {
-            throw new BaseException("支付宝转账api调用错误",e);
+			throw new BaseException("支付宝转账api调用错误", e);
 		}
 		if (response.isSuccess()) {
 			return fundPayVo.getOutBizNo();
 		} else {
-            throw  new BaseException(response.getSubMsg(),response.getSubCode());
+			throw new BaseException(response.getSubMsg(), response.getSubCode());
 		}
 	}
 
 	public String wxpayfundTrans(FundPayVo fundPayVo) {
-        Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getPayeeAccount(),fundPayVo.getOutBizNo(),fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
+		Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getPayeeAccount(), fundPayVo.getOutBizNo(), fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
 		if (SUCCESS.equals(map.get(WxResponseProperties.RETURN_CODE)) && SUCCESS.equals(map.get(WxResponseProperties.RESULT_CODE))) {
 			return map.get(WxResponseProperties.PARTNER_TRADE_NO);
 		}
-        throw new BaseException(map.get(WxResponseProperties.ERR_CODE_DES),map.get(WxResponseProperties.ERROR_CODE));
+		throw new BaseException(map.get(WxResponseProperties.ERR_CODE_DES), map.get(WxResponseProperties.ERROR_CODE));
 	}
 
 
 	/**
 	 * 支付宝授权获取用户信息
+	 *
 	 * @param code
 	 * @return
 	 * @throws AlipayApiException
 	 */
-    public String getAlipayToken(String code) throws AlipayApiException{
+	public String getAlipayToken(String code) throws AlipayApiException {
 		AlipayClient alipayClient = getAlipayClient();
 		AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
 		request.setGrantType("authorization_code");
 		request.setCode(code);
 		AlipaySystemOauthTokenResponse response = alipayClient.execute(request);
 		log.info("获取用户token调用成功,获取用户信息 {}", response.getBody());
-        if(response.isSuccess()){
+		if (response.isSuccess()) {
 			log.info("获取用户token调用成功,获取用户信息 {}", response.getBody());
-            if(response.getAccessToken() != null) {
+			if (response.getAccessToken() != null) {
 				AlipayUserInfoShareRequest alipayUserInfoShareRequest = new AlipayUserInfoShareRequest();
-                AlipayUserInfoShareResponse alipayUserInfoShareResponse = alipayClient.execute(alipayUserInfoShareRequest,response.getAccessToken());
-                if(alipayUserInfoShareResponse.isSuccess()){
+				AlipayUserInfoShareResponse alipayUserInfoShareResponse = alipayClient.execute(alipayUserInfoShareRequest, response.getAccessToken());
+				if (alipayUserInfoShareResponse.isSuccess()) {
 					log.info("获取用户支付宝信息调用成功, {}", alipayUserInfoShareResponse.getBody());
 					return alipayUserInfoShareResponse.getBody();
 				} else {
@@ -479,7 +508,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayUserInfoAuthResponse response = alipayClient.execute(request);
 		log.info("解冻预授权response: {}" + response.getBody());
 		log.info(response.toString());
-        if(response.isSuccess()){
+		if (response.isSuccess()) {
 			log.info("用户授权调用成功");
 		} else {
 			log.info("用户授权调用失败");
@@ -610,7 +639,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 				return false;
 			}
 		} catch (Exception e) {
-            log.error(e.getMessage(), e);;
+			log.error(e.getMessage(), e);
+			;
 			log.info("退款失败请重试");
 		}
 		return false;
@@ -618,10 +648,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 
 	/**
 	 * 查询预授权订单
+	 *
 	 * @param tradNo
 	 * @throws AlipayApiException
 	 */
-    public ObjectRestResponse fundAuthQuery(String tradNo){
+	public ObjectRestResponse fundAuthQuery(String tradNo) {
 		AlipayClient alipayClient = getAlipayClient();
 		AlipayFundAuthOperationDetailQueryRequest request = new AlipayFundAuthOperationDetailQueryRequest();
 		AlipayFundAuthOperationDetailQueryModel model = new AlipayFundAuthOperationDetailQueryModel();
@@ -633,7 +664,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		AlipayFundAuthOperationDetailQueryResponse response = null;
 		try {
 			response = alipayClient.execute(request);
-            log.info("response: {}"+response.getBody());
+			log.info("response: {}" + response.getBody());
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
 		}
@@ -642,6 +673,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 
 	/**
 	 * 预授权转支付退款
+	 *
 	 * @param tradNo       预授权转支付商户订单号
 	 * @param refundAmount 退款金额
 	 * @param refundReason 退款原因
@@ -663,7 +695,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
 		} catch (AlipayApiException e) {
 			e.printStackTrace();
 		}
-        log.info("response: {}"+response.getBody());
+		log.info("response: {}" + response.getBody());
 		return response;
 	}
 

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

 package com.upyuns.platform.rs.website.dto;
 
+import lombok.Data;
+
 /**
  * @ClassName : CartOrderDto
  * @Description : 购物车订单参数
  * @Author : jiaoruizhen
  * @Date: 2020-12-04 11:02
  */
+@Data
 public class CartOrderDto {
+
+	String ids;
+
+	//收货地址信息
+	String address;
+	//收货人姓名
+	String name;
+	//收货电话
+	String phone;
+	//配送方式:1、线上配送，2、快递配送
+	Integer sendType;
 }

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

+package com.upyuns.platform.rs.website.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName : OrderInfoDto
+ * @Description : 添加订单信息
+ * @Author : jiaoruizhen
+ * @Date: 2020-12-12 17:09
+ */
+@Data
+public class OrderInfoDto extends PageParam {
+	//详情ID
+	Integer detailId;
+
+	//1、标准数据，2、影像图库，3、行业应用信息
+	Integer type;
+
+	//数量
+	Integer number;
+
+	//单价
+	BigDecimal price;
+
+	//文件地址
+	String filePath;
+}

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

@@ -90,5 +90,8 @@ public class CommonInfo implements Serializable {
 	@ApiModelProperty(value = "排序")
     private Integer rank;
 
-
+	/**
+	 * 图标
+	 */
+	private String icon;
 }

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

@@ -147,4 +147,18 @@ public class ShoppingCartInfo implements Serializable {
 	@ApiModelProperty(value = "")
 	private BigDecimal totalAmount;
 
+
+	public static OrderItem convertToOrderItem(ShoppingCartInfo shoppingCartInfo) {
+		OrderItem orderItem = new OrderItem();
+		orderItem.setDetailId(shoppingCartInfo.getDetailId());
+		orderItem.setDetailJson(shoppingCartInfo.getDetailJson());
+		orderItem.setFilePath(shoppingCartInfo.getFilePath());
+		orderItem.setItemPic(shoppingCartInfo.getItemPic());
+		orderItem.setName(shoppingCartInfo.getName());
+		orderItem.setNumber(shoppingCartInfo.getNumber());
+		orderItem.setPrice(shoppingCartInfo.getPrice());
+		orderItem.setTotalAmount(shoppingCartInfo.getTotalAmount());
+		orderItem.setType(shoppingCartInfo.getType());
+		return orderItem;
+	}
 }

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

@@ -24,7 +24,7 @@ public class UserAddress implements Serializable {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@ApiModelProperty("订单收获地址id")
-	private Long id;
+	private Integer id;
 
 	/**
 	 * 收获人姓名
@@ -92,10 +92,21 @@ public class UserAddress implements Serializable {
 
 	@Column(name = "user_id")
 	@ApiModelProperty(value = "用户ID")
-	private Long userId;
+	private Integer userId;
 
 	/**
 	 * 是否删除： 0、否，1、是
 	 */
 	private Integer isDel;
+
+	/**
+	 * 是否是默认值： 0、否，1、是
+	 */
+	private Integer isDefault;
+
+	/**
+	 * 标签
+	 */
+	private String label;
+
 }

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

@@ -113,4 +113,36 @@ public class UserInvoice implements Serializable {
 
     private Integer isDel;
 
+	/**
+	 * 发票类型： 1、普通发票，2、专票
+	 */
+	private Integer type;
+
+	/**
+	 * 是否是默认值： 0、否，1、是
+	 */
+	private Integer isDefault;
+
+
+	/**
+	 * 省份
+	 */
+	@Column(name = "province")
+	@ApiModelProperty(value = "省份")
+	private String province;
+
+	/**
+	 * 市
+	 */
+	@Column(name = "city")
+	@ApiModelProperty(value = "市")
+	private String city;
+
+	/**
+	 * 乡镇/街道
+	 */
+	@Column(name = "town")
+	@ApiModelProperty(value = "乡镇/街道")
+	private String town;
+
 }

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/type/OrderTypeEnum.java

+package com.upyuns.platform.rs.website.type;
+
+/**
+ * @ClassName : OrderTypeEnum
+ * @Description : 订单类型
+ * @Author : jiaoruizhen
+ * @Date: 2020-12-12 16:50
+ */
+public enum OrderTypeEnum {
+	STANDARD_DATA(1, "标准数据"),
+	INDUSTRY_INFO(3, "行业应用"),
+	IMAGE_STORAGE(2, "影像图库");
+	private Integer type;
+	private String msg;
+
+	OrderTypeEnum(Integer type, String msg) {
+		this.type = type;
+		this.msg = msg;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+
+	public static <T extends OrderTypeEnum> String getType(Integer code, Class<T> t) {
+		for (T item : t.getEnumConstants()) {
+			if (item.getType().equals(code)) {
+				return item.getMsg();
+			}
+		}
+		return "";
+	}
+
+	public static OrderTypeEnum getByCode(Integer code) {
+		for (OrderTypeEnum v : values()) {
+			if (v.getType() == code) {
+				return v;
+			}
+		}
+		return null;
+	}
+
+	public static String getProductStatusEnum(Integer code) {
+		return getType(code, OrderTypeEnum.class);
+	}
+
+}

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

@@ -56,6 +56,7 @@ public class CommonInfoBiz extends BaseBiz<CommonInfoMapper,CommonInfo> {
 	public List<CommonInfo> getByType(Integer type) {
 		Example example = new Example(CommonInfo.class);
 		example.createCriteria().andEqualTo("type", type).andEqualTo("isDel", 0);
+		example.orderBy("rank");
 		return mapper.selectByExample(example);
 	}
 

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

@@ -79,7 +79,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	 */
 	public OrderInfo getOneByOrderNo(String orderNo) {
 		Example example = new Example(OrderInfo.class);
-		example.createCriteria().andEqualTo("orderNo", orderNo).andNotEqualTo("status", -1).andEqualTo("status", -2);
+		example.createCriteria().andEqualTo("orderNo", orderNo).andNotEqualTo("status", -1).andNotEqualTo("status", -2);
 		return mapper.selectOneByExample(example);
 	}
 
@@ -105,14 +105,12 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getName())) {
 			orderItemCriteria.andLike("name", "%"+ userOrderDto.getName() +"%");
 		}
-
 		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
 		List<OrderInfo> orderInfoList = mapper.selectByExample(example);
 		if (orderInfoList != null) {
 
 		}
-
 		return new ArrayList<>();
 	}
 

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 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;
@@ -74,6 +73,7 @@ public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 		if (userAddress == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
+		userAddress.setUserId(appUserVo.getUserid());
 		if (userAddress.getId() != null) {
 			UserAddress old = selectById(userAddress.getId());
 			if (old != null && old.getIsDel() != 1) {
@@ -93,13 +93,54 @@ public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 	 *
 	 * @return
 	 */
-	public List<UserAddress> getUserAddress() {
+	public ObjectRestResponse getUserAddress(UserAddressDto userAddressDto) {
 		AppUserDTO appUserVo = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
 		if (appUserVo == null) {
-			return new ArrayList<>();
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
 		}
+		Query query = new Query(userAddressDto);
 		Example example = new Example(UserAddress.class);
 		example.createCriteria().andEqualTo("userId", appUserVo.getUserid()).andEqualTo("isDel", 0);
-		return mapper.selectByExample(example);
+		example.orderBy("isDefault").desc();
+		PageDataVO<UserAddress> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
+		return ObjectRestResponse.succ(pageDataVO);
+	}
+
+
+	/**
+	 * 设置地址为默认值
+	 * @param id
+	 * @return
+	 */
+	public ObjectRestResponse setDefault(Integer id) {
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		if (id == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		UserAddress userAddress = selectById(id);
+		if (userAddress == null || userAddress.getIsDel() == 1) {
+			return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+		}
+		generateDefault(appUserDTO.getUserid());
+
+		userAddress.setIsDefault(1);
+		updateSelectiveByIdRe(userAddress);
+		return ObjectRestResponse.succ();
+	}
+
+
+	private void generateDefault(Integer userId) {
+		Example example = new Example(UserAddress.class);
+		example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0).andEqualTo("isDefault", 1);
+		List<UserAddress> list = mapper.selectByExample(example);
+		if (list != null && list.size() > 0) {
+			list.parallelStream().forEach(userAddress -> {
+				userAddress.setIsDefault(0);
+				updateSelectiveByIdRe(userAddress);
+			});
+		}
 	}
 }
\ No newline at end of file

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

@@ -2,12 +2,16 @@ package com.upyuns.platform.rs.website.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+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.UserInvoiceDto;
 import com.upyuns.platform.rs.website.entity.OrderEInvoice;
 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.UserInvoice;
@@ -15,6 +19,9 @@ import com.upyuns.platform.rs.website.mapper.UserInvoiceMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * 用户发票信息
  *
@@ -25,6 +32,10 @@ import tk.mybatis.mapper.entity.Example;
 @Service
 public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 
+	@Autowired
+	UserFeign userFeign;
+	@Autowired
+	HttpServletRequest request;
 	/**
 	 * 添加用户发票
 	 * @param userInvoice
@@ -48,6 +59,34 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 		return ObjectRestResponse.succ();
 	}
 
+	/**
+	 * 添加用户发票
+	 * @param userInvoice
+	 * @return
+	 */
+	public ObjectRestResponse userAddUpdate(UserInvoice userInvoice) {
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		if (userInvoice == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		userInvoice.setUserId(appUserDTO.getUserid());
+		if (userInvoice.getId() == null) {
+			UserInvoice old = getOneByTax(userInvoice.getTaxCode(), userInvoice.getUserId());
+			if (old != null && StringUtils.isNotBlank(userInvoice.getTaxCode())) {
+				userInvoice.setId(old.getId());
+				updateData(userInvoice);
+			} else {
+				insertSelectiveRe(userInvoice);
+			}
+		} else {
+			updateData(userInvoice);
+		}
+		return ObjectRestResponse.succ();
+	}
+
 	/**
 	 * 查询发票信息
 	 * @param tax
@@ -81,7 +120,7 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 			criteria.andEqualTo("taxCode", "%" + userInvoiceDto.getTaxCode() + "%");
 		}
 		criteria.andEqualTo("isDel", 0);
-		example.orderBy("updTime").desc();
+		example.orderBy("isDefault").desc();
 		Query query = new Query(userInvoiceDto);
 		PageDataVO<UserInvoice> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 		return ObjectRestResponse.succ(pageDataVO);
@@ -93,6 +132,11 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 	 * @return
 	 */
 	public ObjectRestResponse getUserInvoiceInfo(UserInvoiceDto userInvoiceDto) {
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		userInvoiceDto.setUserId(appUserDTO.getUserid());
 		return getList(userInvoiceDto);
 	}
 
@@ -108,4 +152,41 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 		return ObjectRestResponse.succ();
 	}
 
+	/**
+	 * 设置发票为默认值
+	 * @param id
+	 * @return
+	 */
+	public ObjectRestResponse setDefault(Integer id) {
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		if (id == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		UserInvoice userInvoice = selectById(id);
+		if (userInvoice == null || userInvoice.getIsDel() == 1) {
+			return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+		}
+		generateDefault(appUserDTO.getUserid());
+
+		userInvoice.setIsDefault(1);
+		updateSelectiveByIdRe(userInvoice);
+		return ObjectRestResponse.succ();
+	}
+
+
+	private void generateDefault(Integer userId) {
+		Example example = new Example(UserInvoice.class);
+		example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0).andEqualTo("isDefault", 1);
+		List<UserInvoice> list = mapper.selectByExample(example);
+		if (list != null && list.size() > 0) {
+			list.parallelStream().forEach(userInvoice -> {
+				userInvoice.setIsDefault(0);
+				updateSelectiveByIdRe(userInvoice);
+			});
+		}
+	}
+
 }
\ No newline at end of file

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

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.CompanyInfoBiz;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class CompanyInfoWebController extends BaseController<CompanyInfoBiz,CompanyInfo> {
 
 	@GetMapping(value = "/app/unauth/detail")
+	@IgnoreUserToken
 	public ObjectRestResponse getOne() {
 		return baseBiz.getIndexShow();
 	}

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

@@ -25,6 +25,7 @@ public class ImageImgStorageWebController extends BaseController<ImageImgStorage
 	}
 
 	@GetMapping(value = "/app/unauth/getList")
+	@IgnoreUserToken
 	public ObjectRestResponse getList(ImageInformationStorageDto imageInformationStorageDto) {
 		return baseBiz.selectList(imageInformationStorageDto, 2);
 	}

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

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.IndustryApplicationInfoBiz;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 public class IndustryApplicationWebInfoController extends BaseController<IndustryApplicationInfoBiz, IndustryApplicationInfo> {
 
 	@GetMapping(value = "/app/unauth/getList")
+	@IgnoreUserToken
 	public ObjectRestResponse getList(IndustryApplicationInfoDto industryApplicationInfoDto) {
 		industryApplicationInfoDto.setSortType(1);
 		industryApplicationInfoDto.setStatus(1);
@@ -19,11 +21,13 @@ public class IndustryApplicationWebInfoController extends BaseController<Industr
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll() {
 		return baseBiz.getAllIndexShow();
 	}
 
 	@GetMapping(value = "/app/unauth/detail")
+	@IgnoreUserToken
 	public ObjectRestResponse detail(Integer id) {
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}

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

 package com.upyuns.platform.rs.website.controller.web;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.NewsInfoBiz;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 public class NewsInfoWebController extends BaseController<NewsInfoBiz, NewsInfo> {
 
 	@GetMapping(value = "/app/unauth/getList")
+	@IgnoreUserToken
 	public ObjectRestResponse getList(NewsInfoDto newsInfoDto) {
 		newsInfoDto.setStatus(1);
 		newsInfoDto.setSortType(1);
@@ -19,11 +21,13 @@ public class NewsInfoWebController extends BaseController<NewsInfoBiz, NewsInfo>
 	}
 
 	@GetMapping(value = "/app/unauth/getAll")
+	@IgnoreUserToken
 	public ObjectRestResponse getAll(NewsInfoDto newsInfoDto) {
 		return baseBiz.selectList(newsInfoDto);
 	}
 
 	@GetMapping(value = "/app/unauth/detail")
+	@IgnoreUserToken
 	public ObjectRestResponse detail(Integer id) {
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ShoppingCartInfoWebController.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.ShoppingCartInfoBiz;
+import com.upyuns.platform.rs.website.dto.CartOrderDto;
+import com.upyuns.platform.rs.website.dto.OrderInfoDto;
 import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("shoppingCartInfo/web")
 public class ShoppingCartInfoWebController extends BaseController<ShoppingCartInfoBiz,ShoppingCartInfo> {
 
+	@PostMapping(value = "addUpdate")
+	public ObjectRestResponse addUpdate(@RequestBody OrderInfoDto orderInfoDto) {
+		return baseBiz.addShoppingCart(orderInfoDto);
+	}
+
+	@GetMapping(value = "getUserShoppingCart")
+	public ObjectRestResponse getUserShoppingCart(OrderInfoDto orderInfoDto) {
+		return baseBiz.getUserAllCart(orderInfoDto);
+	}
+
+	@PostMapping(value = "convertToOrderInfo")
+	public ObjectRestResponse convertToOrderInfo(CartOrderDto cartOrderDto) {
+		return baseBiz.convertShopCartToOrderInfo(cartOrderDto);
+	}
+
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.UserAddressBiz;
 import com.upyuns.platform.rs.website.dto.UserAddressDto;
 import com.upyuns.platform.rs.website.entity.UserAddress;
+import com.upyuns.platform.rs.website.entity.UserInvoice;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -17,8 +18,12 @@ public class UserAddressWebController extends BaseController<UserAddressBiz,User
 	}
 
 	@GetMapping(value = "getUserAddress")
-	public ObjectRestResponse getUserAddress() {
-		return ObjectRestResponse.succ(baseBiz.getUserAddress());
+	public ObjectRestResponse getUserAddress(UserAddressDto userAddressDto) {
+		return baseBiz.getUserAddress(userAddressDto);
 	}
 
+	@PostMapping(value = "setDefault")
+	public ObjectRestResponse setDefault(@RequestBody UserAddress userAddress) {
+		return baseBiz.setDefault(userAddress.getId());
+	}
 }
\ No newline at end of file

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

@@ -13,11 +13,17 @@ public class UserInvoiceWebController extends BaseController<UserInvoiceBiz,User
 
 	@PostMapping(value = "addUpdate")
 	public ObjectRestResponse addUpdate(@RequestBody UserInvoice userInvoice) {
-		return baseBiz.addUpdate(userInvoice);
+		return baseBiz.userAddUpdate(userInvoice);
 	}
 
 	@GetMapping(value = "getUserList")
 	public ObjectRestResponse getUserList(UserInvoiceDto userInvoiceDto) {
 		return baseBiz.getUserInvoiceInfo(userInvoiceDto);
 	}
+
+	@PostMapping(value = "setDefault")
+	public ObjectRestResponse setDefault(@RequestBody UserInvoice userInvoice) {
+		return baseBiz.setDefault(userInvoice.getId());
+	}
+
 }
\ No newline at end of file