Skip to content

R
rs-cloud-platform
Commit 3146a155 authored by unset's avatar unset
Browse files
Options

修改支付信息

parent 98fd3953
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 154 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
View file @ 3146a155
......@@ -73,6 +73,11 @@ public class AppUserManageDTO {
* 真实姓名
*/
private String realName;
/**
* 状态：0-启用，1-禁用
*/
private Integer status;
// /**
// * 接收前台时间范围
// */
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ 3146a155
......@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.collections.CollectionUtils;
......@@ -98,6 +99,25 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
return mapper.getUserInfo(id);
}
/**
* 启用禁用
* @param appUserLogin
* @return
*/
public ObjectRestResponse updateStatus(AppUserLogin appUserLogin) {
if (appUserLogin == null || appUserLogin.getId() == null || appUserLogin.getStatus() == null) {
return ObjectRestResponse.paramIsEmpty();
}
AppUserLogin old = appUserLoginMapper.selectByPrimaryKey(appUserLogin.getId());
if (old == null || old.getIsdel() == 1) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
old.setStatus(appUserLogin.getStatus());
appUserLoginMapper.updateByPrimaryKeySelective(old);
return ObjectRestResponse.succ();
}
/**
*保存
* @param appUserVo
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
View file @ 3146a155
......@@ -74,6 +74,11 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
// }
}
@PostMapping(value = "updateStatus")
public ObjectRestResponse updateStatus(@RequestBody AppUserLogin appUserLogin) {
return baseBiz.updateStatus(appUserLogin);
}
/**
* 根据用户id获取用户详情
* @param userId
......
ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
View file @ 3146a155
......@@ -217,6 +217,9 @@
<if test="userId!=null">
and l.id=#{userId}
</if>
<if test="status != null">
and l.status = #{status}
</if>
<if test="postionState != null">
<choose>
<when test="postionState == 6">
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ItemInfoDto.java
View file @ 3146a155
......@@ -11,7 +11,7 @@ import lombok.Data;
@Data
public class ItemInfoDto {
Integer id;
Long id;
Integer number;
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/OrderInfoDto.java
View file @ 3146a155
......@@ -42,9 +42,13 @@ public class OrderInfoDto extends PageParam {
*/
private List<ItemInfoDto> itemInfoDtoList;
/**
* 发票内容
*/
private String invoiceContent;
//详情ID
Integer detailId;
Long detailId;
//1、标准数据，2、影像图库，3、行业应用信息
Integer type;
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderInfo.java
View file @ 3146a155
......@@ -4,13 +4,14 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 订单信息
*
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-12-03 13:29:23
......@@ -19,166 +20,176 @@ import lombok.Data;
@Table(name = "order_info")
public class OrderInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Long orderId;
/**
* 订单号
*/
@Column(name = "order_no")
private Long orderId;
/**
* 订单号
*/
@Column(name = "order_no")
@ApiModelProperty(value = "订单号")
private String orderNo;
/**
* 单价
*/
@Column(name = "amount")
private String orderNo;
/**
* 单价
*/
@Column(name = "amount")
@ApiModelProperty(value = "单价")
private BigDecimal amount;
/**
* 数量
*/
@Column(name = "number")
private BigDecimal amount;
/**
* 数量
*/
@Column(name = "number")
@ApiModelProperty(value = "数量")
private Integer number;
/**
* 订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消
*/
@Column(name = "status")
@ApiModelProperty(value = " 订单状态：1--创建订单，2--待付款，3--已支付，4--已发货,5--已完成 -1、删除，-2、取消")
private Integer status;
private Integer number;
/**
* 订单状态：0、定制订单无价格 1--创建订单，2--待付款，3--已支付，4--已发货, 5--已收货, 6、已完成 -1、删除，-2、取消, -3 退款
*/
@Column(name = "status")
@ApiModelProperty(value = " 订单状态：0、定制订单无价格 1--创建订单，2--待付款，3--已支付，4--已发货, 5--已收货, 6、已完成 -1、删除，-2、取消, -3 退款")
private Integer status;
/**
* 发货状态0待发货，1已发货，2收货，3退货,
*/
private Integer shippingStatus;
/**
* 支付状态：1--未支付，2--已支付
* 1待付款，2已付款，3已退款
*/
private Integer payStatus;
/**
* 用户id
*/
@Column(name = "user_id")
/**
* 用户id
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户id")
private Integer userId;
/**
* 用户手机号
*/
@Column(name = "phone")
private Integer userId;
/**
* 用户手机号
*/
@Column(name = "phone")
@ApiModelProperty(value = "用户手机号")
private String phone;
/**
* 用户昵称
*/
@Column(name = "nickname")
private String phone;
/**
* 用户昵称
*/
@Column(name = "nickname")
@ApiModelProperty(value = "用户昵称")
private String nickname;
/**
* 用户真实姓名
*/
@Column(name = "real_name")
private String nickname;
/**
* 用户真实姓名
*/
@Column(name = "real_name")
@ApiModelProperty(value = "用户真实姓名")
private String realName;
/**
* 头像
*/
@Column(name = "head_img")
private String realName;
/**
* 头像
*/
@Column(name = "head_img")
@ApiModelProperty(value = "头像")
private String headImg;
/**
* 1、微信支付，2、支付宝支付，3、对公支付
*/
@Column(name = "pay_type")
private String headImg;
/**
* 1、微信支付，2、支付宝支付，3、对公支付
*/
@Column(name = "pay_type")
@ApiModelProperty(value = "1、微信支付，2、支付宝支付，3、对公支付")
private Integer payType;
/**
* 下单时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "下单时间", hidden = true )
private Date crtTime;
/**
* 支付时间
*/
@Column(name = "pay_time")
private Integer payType;
/**
* 下单时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "下单时间", hidden = true)
private Date crtTime;
/**
* 支付时间
*/
@Column(name = "pay_time")
@ApiModelProperty(value = "支付时间")
private Date payTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 运费
*/
@Column(name = "fee")
private Date payTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true)
private Date updTime;
/**
* 运费
*/
@Column(name = "fee")
@ApiModelProperty(value = "运费")
private BigDecimal fee;
/**
* 订单备注
*/
@Column(name = "remark")
private BigDecimal fee;
/**
* 订单备注
*/
@Column(name = "remark")
@ApiModelProperty(value = "订单备注")
private String remark;
/**
* 配送方式:1、线上配送，2、快递配送
*/
@Column(name = "send_type")
private String remark;
/**
* 配送方式:1、线上配送，2、快递配送
*/
@Column(name = "send_type")
@ApiModelProperty(value = "配送方式:1、线上配送，2、快递配送")
private Integer sendType;
/**
* 收货人姓名
*/
@Column(name = "receive_name")
private Integer sendType;
/**
* 收货人姓名
*/
@Column(name = "receive_name")
@ApiModelProperty(value = "收货人姓名")
private String receiveName;
/**
* 收货人电话
*/
@Column(name = "receive_phone")
private String receiveName;
/**
* 收货人电话
*/
@Column(name = "receive_phone")
@ApiModelProperty(value = "收货人电话")
private String receivePhone;
/**
* 收货地址
*/
@Column(name = "receive_address")
private String receivePhone;
/**
* 收货地址
*/
@Column(name = "receive_address")
@ApiModelProperty(value = "收货地址")
private String receiveAddress;
/**
*
*/
@Column(name = "total_amount")
private String receiveAddress;
/**
* 总金额
*/
@Column(name = "total_amount")
@ApiModelProperty(value = "")
private BigDecimal totalAmount;
/**
*
*/
@Column(name = "type")
private BigDecimal totalAmount;
/**
* 1、普通订单，2、定制订单
*/
@Column(name = "type")
@ApiModelProperty(value = "1、普通订单，2、定制订单")
private Integer type;
private Integer type;
/**
* 发票状态： 1、未开发票，2、已开发票, 3、已发货， 4、已收货、5、退回， 6、已完成
*/
private Integer invoiceStatus;
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderItem.java
View file @ 3146a155
......@@ -47,7 +47,7 @@ public class OrderItem implements Serializable {
*/
@Column(name = "detail_id")
@ApiModelProperty(value = "详情id")
private Integer detailId;
private Long detailId;
/**
* 详情json信息
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/ShoppingCartInfo.java
View file @ 3146a155
......@@ -40,7 +40,7 @@ public class ShoppingCartInfo implements Serializable {
*/
@Column(name = "detail_id")
@ApiModelProperty(value = "详情id")
private Integer detailId;
private Long detailId;
/**
* 详情json信息
......
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/ItemInfoVo.java
View file @ 3146a155
......@@ -12,7 +12,7 @@ import java.math.BigDecimal;
*/
@Data
public class ItemInfoVo {
private Integer id;
private Long id;
private String detailJson;
private Integer number;
private BigDecimal price;
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @ 3146a155
......@@ -182,7 +182,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
break;
//行业应用
case INDUSTRY_INFO:
IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId()).getData();
IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId().intValue()).getData();
if (industryApplicationInfo != null) {
OrderItem orderItem = new OrderItem();
orderItem.setType(itemInfoDto.getType());
......@@ -192,7 +192,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderItem.setName(industryApplicationInfo.getTitle());
orderItem.setItemPic(industryApplicationInfo.getCoverImg());
orderItem.setDetailJson(JSONObject.toJSONString(industryApplicationInfo));
orderItem.setDetailId(industryApplicationInfo.getId());
orderItem.setDetailId(Long.valueOf(industryApplicationInfo.getId()));
orderItemList.add(orderItem);
//总数量
number.updateAndGet(v -> v + itemInfoDto.getNumber());
......@@ -204,7 +204,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
case IMAGE_STORAGE:
ImageInfoRelation imageInfoRelation = imageInfoRelationBiz.selectById(itemInfoDto.getId());
if (imageInfoRelation != null ) {
ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId()).getData();
ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId().intValue()).getData();
if (imageImgStorage != null) {
List<ImageInfoRelation> imageInfoRelationList = new ArrayList<>();
imageInfoRelationList.add(imageInfoRelation);
......@@ -217,7 +217,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderItem.setName(imageImgStorage.getName());
orderItem.setItemPic(imageImgStorage.getCoverImg());
orderItem.setDetailJson(JSONObject.toJSONString(imageImgStorage));
orderItem.setDetailId(imageImgStorage.getId());
orderItem.setDetailId(Long.valueOf(imageImgStorage.getId()));
orderItemList.add(orderItem);
//总数量
number.updateAndGet(v -> v + itemInfoDto.getNumber());
......@@ -269,6 +269,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
}
orderInfo.setRemark(orderInfoDto.getRemark());
orderInfo.setAmount(new BigDecimal(amount.get()));
orderInfo.setNumber(number.get());
Dictionary dictionary = thirdFeign.findDictionaryByTypeAndCode(DictionaryKey.APP_ORDER, DictionaryKey.SEND_FEE);
if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
orderInfo.setFee(new BigDecimal(dictionary.getDetail()));
......@@ -305,7 +306,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderEInvoice.setContentAccount(userInvoice.getOpenBank() + " " + userInvoice.getAccount());
orderEInvoice.setContentContact(orderInfo.getReceiveAddress() + " " + orderInfo.getReceiveName() + " " + orderInfo.getReceivePhone());
//发票内容
orderEInvoice.setContentTitle("");
if (StringUtils.isNotBlank(orderInfoDto.getInvoiceContent())) {
orderEInvoice.setContentTitle(orderInfoDto.getInvoiceContent());
}
orderEInvoiceBiz.addUpdate(orderEInvoice);
}
}
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderItemBiz.java
View file @ 3146a155
......@@ -5,6 +5,9 @@ import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.OrderItem;
import com.upyuns.platform.rs.website.mapper.OrderItemMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.List;
/**
* 订单商品信息
......@@ -16,4 +19,15 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
@Service
public class OrderItemBiz extends BaseBiz<OrderItemMapper,OrderItem> {
/**
* 根据订单号查询所有订单商品
* @param orderIdList
* @return
*/
public List<OrderItem> getAllByOrderId(List<Long> orderIdList) {
Example example = new Example(OrderItem.class);
example.createCriteria().andIn("orderId", orderIdList);
return mapper.selectByExample(example);
}
}
\ No newline at end of file
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
View file @ 3146a155
......@@ -126,7 +126,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
updateSelectiveByIdRe(old);
} else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setDetailId(imageImgStorage.getId());
shoppingCartInfo.setDetailId(Long.valueOf(imageImgStorage.getId()));
shoppingCartInfo.setDetailJson(JSONObject.toJSONString(imageImgStorage));
shoppingCartInfo.setPrice(orderInfoDto.getPrice());
shoppingCartInfo.setFilePath(orderInfoDto.getFilePath());
......@@ -159,7 +159,7 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
updateSelectiveByIdRe(old);
} else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setDetailId(industryApplicationInfo.getId());
shoppingCartInfo.setDetailId(Long.valueOf(industryApplicationInfo.getId()));
shoppingCartInfo.setDetailJson(JSONObject.toJSONString(industryApplicationInfo));
shoppingCartInfo.setPrice(orderInfoDto.getPrice());
shoppingCartInfo.setFilePath(orderInfoDto.getFilePath());
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java
View file @ 3146a155
......@@ -70,10 +70,10 @@ public class ConfirmOrderService {
break;
//行业应用
case INDUSTRY_INFO:
IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId()).getData();
IndustryApplicationInfo industryApplicationInfo = industryApplicationInfoBiz.getOneById(itemInfoDto.getId().intValue()).getData();
if (industryApplicationInfo != null) {
ItemInfoVo itemInfoVo = new ItemInfoVo();
itemInfoVo.setId(industryApplicationInfo.getId());
itemInfoVo.setId(Long.valueOf(industryApplicationInfo.getId()));
itemInfoVo.setDetailJson(JSONObject.toJSONString(industryApplicationInfo));
itemInfoVo.setImg(industryApplicationInfo.getCoverImg());
itemInfoVo.setNumber(itemInfoDto.getNumber());
......@@ -91,13 +91,13 @@ public class ConfirmOrderService {
case IMAGE_STORAGE:
ImageInfoRelation imageInfoRelation = imageInfoRelationBiz.selectById(itemInfoDto.getId());
if (imageInfoRelation != null ) {
ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId()).getData();
ImageImgStorage imageImgStorage = imageImgStorageBiz.getDetail(itemInfoDto.getId().intValue()).getData();
if (imageImgStorage != null) {
List<ImageInfoRelation> imageInfoRelationList = new ArrayList<>();
imageInfoRelationList.add(imageInfoRelation);
imageImgStorage.setImageInfoRelationList(imageInfoRelationList);
ItemInfoVo itemInfoVo = new ItemInfoVo();
itemInfoVo.setId(imageImgStorage.getId());
itemInfoVo.setId(Long.valueOf(imageImgStorage.getId()));
itemInfoVo.setPrice(imageInfoRelation.getPrice());
itemInfoVo.setType(itemInfoDto.getType());
itemInfoVo.setNumber(itemInfoDto.getNumber());
......@@ -117,7 +117,7 @@ public class ConfirmOrderService {
ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId());
if (shoppingCartInfo != null) {
ItemInfoVo itemInfoVo = new ItemInfoVo();
itemInfoVo.setId(shoppingCartInfo.getCartId().intValue());
itemInfoVo.setId(shoppingCartInfo.getCartId());
itemInfoVo.setPrice(shoppingCartInfo.getPrice());
itemInfoVo.setType(shoppingCartInfo.getType());
itemInfoVo.setNumber(itemInfoDto.getNumber());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment