Skip to content

Z
zion
提交 94c5ef9f authored 作者: luojie's avatar luojie
浏览文件
操作

修改提供给第三方的接口，修改物流状态订单状态

上级 0d22826b
隐藏空白字符变更
内嵌 并排
正在显示 包含 667 行增加 和 347 行删除
src/main/java/com/diaoyun/zion/chinafrica/api/ThirdPartyController.java
浏览文件 @ 94c5ef9f
...@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/chinafrica/api") @RequestMapping("/chinafrica/api")
public class ThirdPartyController { public class ThirdPartyController {
private static Logger logger= LoggerFactory.getLogger(ThirdPartyController.class); private static Logger logger= LoggerFactory.getLogger(ThirdPartyController.class);
@Autowired @Autowired
private TbCfOrderService tbCfOrderService; private TbCfOrderService tbCfOrderService;
@Autowired @Autowired
private TbCfUserInfoService tbCfUserInfoService; private TbCfUserInfoService tbCfUserInfoService;
...@@ -46,7 +46,7 @@ public class ThirdPartyController { ...@@ -46,7 +46,7 @@ public class ThirdPartyController {
return tbCfOrderService.getOrderListByTime(beginTime,endTime,pageNum,pageSize); return tbCfOrderService.getOrderListByTime(beginTime,endTime,pageNum,pageSize);
} }
/** /**
*获取某段时间已发货订单数据 *获取某段时间已发货订单数据
*/ */
@ApiOperation(value = "获取某段时间已发货订单数据") @ApiOperation(value = "获取某段时间已发货订单数据")
...@@ -65,7 +65,9 @@ public class ThirdPartyController { ...@@ -65,7 +65,9 @@ public class ThirdPartyController {
} }
/** /**
* 根据订单号获取详细订单数据 * 根据订单号获取详细订单数据2
*
*
*/ */
@ApiOperation(value = "根据订单号获取详细订单数据") @ApiOperation(value = "根据订单号获取详细订单数据")
@GetMapping(value ="/order/detail/{orderId}") @GetMapping(value ="/order/detail/{orderId}")
...@@ -73,18 +75,20 @@ public class ThirdPartyController { ...@@ -73,18 +75,20 @@ public class ThirdPartyController {
return tbCfOrderService.getOrderDetailThird(orderId); return tbCfOrderService.getOrderDetailThird(orderId);
} }
/** /**
* 获取用户列表 * 根据userId获取用户信息
* @return
*/ */
@ApiOperation(value = "获取用户列表") @ApiOperation(value = "获取用户列表")
@GetMapping(value ="/user") @GetMapping(value ="/user/{userId}")
public Result getAllUser( @ApiParam(value = "页数") @RequestParam(required = false) Integer pageNum, public Result getAllUser(@PathVariable("userId")String userId) {
@ApiParam(value ="每页大小 默认100") @RequestParam(required = false) Integer pageSize) { return tbCfUserInfoService.queryUserByUserId(userId);
if (pageNum == null) { }
pageNum = 1; /**
} * 获取报关品名
if (pageSize == null) { */
pageSize = 100; @ApiOperation(value = "获取报关品名")
} @GetMapping(value ="/description/{descriptionId}")
return tbCfUserInfoService.queryUserList(pageNum,pageSize); public Result getDescriptionList(@PathVariable("descriptionId")String descriptionId) {
return tbCfOrderService.getDescriptionById(descriptionId);
} }
} }
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfExpressTemplateDao.java
浏览文件 @ 94c5ef9f
package com.diaoyun.zion.chinafrica.dao; package com.diaoyun.zion.chinafrica.dao;
import com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity; import com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity;
import com.diaoyun.zion.chinafrica.vo.ExpressTemplateVo;
import com.diaoyun.zion.master.dao.BaseDao; import com.diaoyun.zion.master.dao.BaseDao;
import java.util.List;
/** /**
* 运费模板Dao * 运费模板Dao
* *
...@@ -11,4 +14,7 @@ import com.diaoyun.zion.master.dao.BaseDao; ...@@ -11,4 +14,7 @@ import com.diaoyun.zion.master.dao.BaseDao;
*/ */
public interface TbCfExpressTemplateDao extends BaseDao<TbCfExpressTemplateEntity> { public interface TbCfExpressTemplateDao extends BaseDao<TbCfExpressTemplateEntity> {
List<TbCfExpressTemplateEntity> getDescriptionList();
ExpressTemplateVo getDescriptionById(String descriptionId);
} }
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfItemOrderRDao.java
浏览文件 @ 94c5ef9f
...@@ -13,10 +13,14 @@ import java.util.List; ...@@ -13,10 +13,14 @@ import java.util.List;
*/ */
public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> { public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> {
TbCfItemOrderREntity queryByTitle(String itemTitle);
/** /**
* 批量保存 * 批量保存
* @param itemOrderRList * @param itemOrderRList
* @return * @return
*/ */
int saveBatch(List<TbCfItemOrderREntity> itemOrderRList); int saveBatch(List<TbCfItemOrderREntity> itemOrderRList);
int updates(TbCfItemOrderREntity itemOrderR);
} }
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfUserInfoDao.java
浏览文件 @ 94c5ef9f
...@@ -5,8 +5,6 @@ import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity; ...@@ -5,8 +5,6 @@ import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity;
import com.diaoyun.zion.chinafrica.vo.TbCfUserVo; import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;
import com.diaoyun.zion.master.dao.BaseDao; import com.diaoyun.zion.master.dao.BaseDao;
import java.util.List;
/** /**
* 用户表Dao * 用户表Dao
* *
...@@ -60,8 +58,8 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> { ...@@ -60,8 +58,8 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
TbCfUserInfoEntity findByEmail(String email); TbCfUserInfoEntity findByEmail(String email);
/** /**
* 提供给第三方的用户列表 * 根据userID获取用户信息
* @return * @return
*/ */
List<TbCfUserVo> queryUserList(); TbCfUserVo queryUserByUserId(String userId);
} }
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemOrderREntity.java
浏览文件 @ 94c5ef9f
...@@ -30,6 +30,14 @@ public class TbCfItemOrderREntity implements Serializable { ...@@ -30,6 +30,14 @@ public class TbCfItemOrderREntity implements Serializable {
*/ */
private Integer enableFlag; private Integer enableFlag;
private Integer orderStatus;
private Integer deliveryFlag;
private Date deliveryTime;
private Date closeTime;
private Date updateTime;
/** /**
* 设置：记录表 * 设置：记录表
*/ */
...@@ -82,4 +90,44 @@ public class TbCfItemOrderREntity implements Serializable { ...@@ -82,4 +90,44 @@ public class TbCfItemOrderREntity implements Serializable {
public Integer getEnableFlag() { public Integer getEnableFlag() {
return enableFlag; return enableFlag;
} }
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public Integer getDeliveryFlag() {
return deliveryFlag;
}
public void setDeliveryFlag(Integer deliveryFlag) {
this.deliveryFlag = deliveryFlag;
}
public Date getDeliveryTime() {
return deliveryTime;
}
public void setDeliveryTime(Date deliveryTime) {
this.deliveryTime = deliveryTime;
}
public Date getCloseTime() {
return closeTime;
}
public void setCloseTime(Date closeTime) {
this.closeTime = closeTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
} }
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemShippedEntity.java
浏览文件 @ 94c5ef9f
package com.diaoyun.zion.chinafrica.entity; package com.diaoyun.zion.chinafrica.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
...@@ -40,11 +39,18 @@ public class TbCfItemShippedEntity implements Serializable { ...@@ -40,11 +39,18 @@ public class TbCfItemShippedEntity implements Serializable {
* 商品ID * 商品ID
*/ */
private String itemId; private String itemId;
/**
* 商品ID
*/
private String itemNum;
/**
* 国家
*/
private String country;
/** /**
* 商品品名 * 商品品名
*/ */
private String descripitionName; private String descripitionId;
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
...@@ -58,12 +64,12 @@ public class TbCfItemShippedEntity implements Serializable { ...@@ -58,12 +64,12 @@ public class TbCfItemShippedEntity implements Serializable {
this.itemId = itemId; this.itemId = itemId;
} }
public String getDescripitionName() { public String getDescripitionId() {
return descripitionName; return descripitionId;
} }
public void setDescripitionName(String descripitionName) { public void setDescripitionId(String descripitionId) {
this.descripitionName = descripitionName; this.descripitionId = descripitionId;
} }
/** /**
...@@ -111,4 +117,20 @@ public class TbCfItemShippedEntity implements Serializable { ...@@ -111,4 +117,20 @@ public class TbCfItemShippedEntity implements Serializable {
public void setExpressId(String expressId) { public void setExpressId(String expressId) {
this.expressId = expressId; this.expressId = expressId;
} }
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getItemNum() {
return itemNum;
}
public void setItemNum(String itemNum) {
this.itemNum = itemNum;
}
} }
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfOrderEntity.java
浏览文件 @ 94c5ef9f
...@@ -13,7 +13,10 @@ import java.util.Date; ...@@ -13,7 +13,10 @@ import java.util.Date;
*/ */
public class TbCfOrderEntity implements Serializable { public class TbCfOrderEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private String ordersId;
/** /**
* 订单id * 订单id
*/ */
...@@ -496,4 +499,12 @@ public class TbCfOrderEntity implements Serializable { ...@@ -496,4 +499,12 @@ public class TbCfOrderEntity implements Serializable {
public void setEnableFlag(Integer enableFlag) { public void setEnableFlag(Integer enableFlag) {
this.enableFlag = enableFlag; this.enableFlag = enableFlag;
} }
public String getOrdersId() {
return ordersId;
}
public void setOrdersId(String ordersId) {
this.ordersId = ordersId;
}
} }
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java
浏览文件 @ 94c5ef9f
...@@ -95,7 +95,7 @@ public interface TbCfOrderService { ...@@ -95,7 +95,7 @@ public interface TbCfOrderService {
* @param orderStatus 订单状态 OrderStatusEnum * @param orderStatus 订单状态 OrderStatusEnum
* @return * @return
*/ */
Result getUserOrderList(Integer pageNum, Integer pageSize,Integer orderStatus) throws InterruptedException; Result getUserOrderList(Integer pageNum, Integer pageSize,Integer orderStatus) throws InterruptedException;
/** /**
* 取消订单 * 取消订单
...@@ -169,4 +169,6 @@ public interface TbCfOrderService { ...@@ -169,4 +169,6 @@ public interface TbCfOrderService {
*/ */
Result getOrderDetail(String orderId); Result getOrderDetail(String orderId);
Result getDescriptionById(String descriptionId);
} }
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfUserInfoService.java
浏览文件 @ 94c5ef9f
...@@ -81,7 +81,7 @@ public interface TbCfUserInfoService { ...@@ -81,7 +81,7 @@ public interface TbCfUserInfoService {
* 发送注册验证码 * 发送注册验证码
* @param email * @param email
* @return * @return
*/ */
Integer sendRegisterIdentifyCode(String email,String nick) throws EmailException, TemplateException, IOException; Integer sendRegisterIdentifyCode(String email,String nick) throws EmailException, TemplateException, IOException;
/** /**
...@@ -177,5 +177,5 @@ public interface TbCfUserInfoService { ...@@ -177,5 +177,5 @@ public interface TbCfUserInfoService {
boolean checkUserByNick(String name); boolean checkUserByNick(String name);
Result queryUserList(Integer pageNum, Integer pageSize); Result queryUserByUserId(String userId);
} }
src/main/java/com/diaoyun/zion/chinafrica/service/impl/FlutterWaveServiceImpl.java
浏览文件 @ 94c5ef9f
...@@ -3,9 +3,11 @@ package com.diaoyun.zion.chinafrica.service.impl; ...@@ -3,9 +3,11 @@ package com.diaoyun.zion.chinafrica.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.diaoyun.zion.chinafrica.constant.KeyConstant; import com.diaoyun.zion.chinafrica.constant.KeyConstant;
import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao; import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao;
import com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao;
import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao; import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao;
import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao; import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao;
import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity; import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
import com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity;
import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity; import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum; import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum; import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
...@@ -50,7 +52,10 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -50,7 +52,10 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
@Autowired @Autowired
private TbCfOrderDao tbCfOrderDao; private TbCfOrderDao tbCfOrderDao;
@Autowired @Autowired
private TbCfToiCouponDao TbCfToiCouponDao; private TbCfToiCouponDao tbCfToiCouponDao;
@Autowired
private TbCfItemOrderRDao tbCfItemOrderRDao;
@Autowired @Autowired
private DomainProperties domainProperties; private DomainProperties domainProperties;
@Resource @Resource
...@@ -140,7 +145,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -140,7 +145,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
changeOrderState(paymentid, tbCfOrderVo); changeOrderState(paymentid, tbCfOrderVo);
//修改优惠券状态 //修改优惠券状态
if (tbCfOrderVo.getCouponId() != null && "20".equals(tbCfOrderVo.getOrderStatus())) { if (tbCfOrderVo.getCouponId() != null && "20".equals(tbCfOrderVo.getOrderStatus())) {
TbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId()); tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
} }
//生成支付流水 //生成支付流水
TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo); TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo);
...@@ -227,13 +232,18 @@ public class FlutterWaveServiceImpl implements FlutterWaveService { ...@@ -227,13 +232,18 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
*/ */
private void changeOrderState(String payId, TbCfOrderVo oldOrder) { private void changeOrderState(String payId, TbCfOrderVo oldOrder) {
//更改订单状态 //更改订单状态
TbCfItemOrderREntity itemOrderR = new TbCfItemOrderREntity();
itemOrderR.setOrderId(oldOrder.getOrderId());
itemOrderR.setUpdateTime(new Date());
itemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
itemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderRDao.updates(itemOrderR);
TbCfOrderEntity tbCfOrder = new TbCfOrderEntity(); TbCfOrderEntity tbCfOrder = new TbCfOrderEntity();
tbCfOrder.setOrderId(oldOrder.getOrderId()); tbCfOrder.setOrderId(oldOrder.getOrderId());
tbCfOrder.setUpdateTime(new Date()); tbCfOrder.setUpdateTime(new Date());
tbCfOrder.setDealTime(new Date()); tbCfOrder.setDealTime(new Date());
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfOrder.setPayId(payId); tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue()); tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder); tbCfOrderDao.update(tbCfOrder);
} }
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/PayPalServiceImpl.java
浏览文件 @ 94c5ef9f
package com.diaoyun.zion.chinafrica.service.impl; package com.diaoyun.zion.chinafrica.service.impl;
import com.diaoyun.zion.chinafrica.constant.KeyConstant; import com.diaoyun.zion.chinafrica.constant.KeyConstant;
import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao; import com.diaoyun.zion.chinafrica.dao.*;
import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
import com.diaoyun.zion.chinafrica.dao.TbCfOrderDao;
import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao;
import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity; import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
import com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity;
import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity; import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum; import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum; import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
...@@ -57,7 +55,8 @@ public class PayPalServiceImpl implements PayPalService { ...@@ -57,7 +55,8 @@ public class PayPalServiceImpl implements PayPalService {
private TbCfIssueCouponDao tbCfIssueCouponDao; private TbCfIssueCouponDao tbCfIssueCouponDao;
@Autowired @Autowired
private TbCfToiCouponDao tbCfToiCouponDao; private TbCfToiCouponDao tbCfToiCouponDao;
@Autowired
private TbCfItemOrderRDao tbCfItemOrderRDao;
private String ORDER_ID = ""; private String ORDER_ID = "";
@Override @Override
...@@ -215,13 +214,18 @@ public class PayPalServiceImpl implements PayPalService { ...@@ -215,13 +214,18 @@ public class PayPalServiceImpl implements PayPalService {
*/ */
private void changeOrderState(String payId, TbCfOrderVo oldOrder) { private void changeOrderState(String payId, TbCfOrderVo oldOrder) {
//更改订单状态 //更改订单状态
TbCfItemOrderREntity itemOrderR = new TbCfItemOrderREntity();
itemOrderR.setOrderId(oldOrder.getOrderId());
itemOrderR.setUpdateTime(new Date());
itemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
itemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderRDao.updates(itemOrderR);
TbCfOrderEntity tbCfOrder = new TbCfOrderEntity(); TbCfOrderEntity tbCfOrder = new TbCfOrderEntity();
tbCfOrder.setOrderId(oldOrder.getOrderId()); tbCfOrder.setOrderId(oldOrder.getOrderId());
tbCfOrder.setUpdateTime(new Date()); tbCfOrder.setUpdateTime(new Date());
tbCfOrder.setDealTime(new Date()); tbCfOrder.setDealTime(new Date());
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfOrder.setPayId(payId); tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue()); tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder); tbCfOrderDao.update(tbCfOrder);
} }
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfItemDetailServiceImpl.java
浏览文件 @ 94c5ef9f
...@@ -46,6 +46,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -46,6 +46,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
@Autowired @Autowired
private TbCfExpTemKeywordDao tbCfExpTemKeywordDao; private TbCfExpTemKeywordDao tbCfExpTemKeywordDao;
@Resource(name="redisTokenManager") @Resource(name="redisTokenManager")
private TokenManager tokenManager; private TokenManager tokenManager;
...@@ -191,7 +192,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService { ...@@ -191,7 +192,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
if ("0".equals(tbCfExpressTemplateList.size())) { if ("0".equals(tbCfExpressTemplateList.size())) {
String[] split = keyword.split(""); String[] split = keyword.split("");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
if(i+1<split.length){ if(i+1<=split.length){
List<TbCfExpressTemplateEntity> tbCfExpressTemplateLists = tbCfExpTemKeywordDao.getTemplateByKeyword(split[i]+split[i+1]); List<TbCfExpressTemplateEntity> tbCfExpressTemplateLists = tbCfExpTemKeywordDao.getTemplateByKeyword(split[i]+split[i+1]);
totalTemplateSet.addAll(tbCfExpressTemplateLists); totalTemplateSet.addAll(tbCfExpressTemplateLists);
} }
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ 94c5ef9f
...@@ -7,10 +7,7 @@ import com.diaoyun.zion.chinafrica.entity.*; ...@@ -7,10 +7,7 @@ import com.diaoyun.zion.chinafrica.entity.*;
import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum; import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum; import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
import com.diaoyun.zion.chinafrica.service.*; import com.diaoyun.zion.chinafrica.service.*;
import com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo; import com.diaoyun.zion.chinafrica.vo.*;
import com.diaoyun.zion.chinafrica.vo.TbCfFinanceVo;
import com.diaoyun.zion.chinafrica.vo.TbCfOrderVo;
import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
import com.diaoyun.zion.master.base.Result; import com.diaoyun.zion.master.base.Result;
import com.diaoyun.zion.master.base.StateConstant; import com.diaoyun.zion.master.base.StateConstant;
import com.diaoyun.zion.master.common.RedisCache; import com.diaoyun.zion.master.common.RedisCache;
...@@ -189,6 +186,17 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -189,6 +186,17 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
} else { } else {
//获取下单的订单数据 //获取下单的订单数据
TbCfOrderVo definiteOrder = ensureOrder(tbCfUserInfoVo, pageOrder, tbCfCartItemDetailList, toitableId); TbCfOrderVo definiteOrder = ensureOrder(tbCfUserInfoVo, pageOrder, tbCfCartItemDetailList, toitableId);
for( TbCfCartItemDetailVo itemList: tbCfCartItemDetailList ){
TbCfItemOrderREntity tbCfItemOrderREntity=new TbCfItemOrderREntity();
tbCfItemOrderREntity.setOrderItemId(IdUtil.createIdbyUUID());
tbCfItemOrderREntity.setOrderId(definiteOrder.getOrderId());
tbCfItemOrderREntity.setItemId(itemList.getItemId());
tbCfItemOrderREntity.setEnableFlag(StateConstant.VALID);
tbCfItemOrderREntity.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderREntity.setOrderStatus(OrderStatusEnum.PENDING_PAY.getValue());
tbCfItemOrderREntity.setUpdateTime(new Date());
tbCfItemOrderRDao.save(tbCfItemOrderREntity);
}
//持久化订单数据 //持久化订单数据
TbCfOrderEntity tbCfOrderEntity = new TbCfOrderEntity(); TbCfOrderEntity tbCfOrderEntity = new TbCfOrderEntity();
BeanUtils.copyProperties(definiteOrder, tbCfOrderEntity); BeanUtils.copyProperties(definiteOrder, tbCfOrderEntity);
...@@ -198,7 +206,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -198,7 +206,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
afterPlaceOrder(tbCfOrderEntity.getOrderId(), tbCfCartItemDetailList, definiteOrder); afterPlaceOrder(tbCfOrderEntity.getOrderId(), tbCfCartItemDetailList, definiteOrder);
result.setData(definiteOrder).setMessage(ResultCodeEnum.SUCCESS.getDesc()); result.setData(definiteOrder).setMessage(ResultCodeEnum.SUCCESS.getDesc());
} }
return result; return result;
} }
...@@ -247,16 +254,16 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -247,16 +254,16 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
@Override @Override
public void cancelOrder(String orderId, String userId, String couponId) { public void cancelOrder(String orderId, String userId, String couponId) {
//更改订单状态 //更改订单状态
TbCfOrderEntity tbCfOrder = new TbCfOrderEntity(); TbCfItemOrderREntity tbCfItemOrderREntity = new TbCfItemOrderREntity();
tbCfOrder.setOrderId(orderId); tbCfItemOrderREntity.setOrderId(orderId);
tbCfOrder.setUpdateTime(new Date()); tbCfItemOrderREntity.setOrderStatus(OrderStatusEnum.CLOSE.getValue());
tbCfOrder.setCloseTime(new Date()); tbCfItemOrderREntity.setUpdateTime(new Date());
tbCfOrder.setOrderStatus(OrderStatusEnum.CLOSE.getValue()); tbCfItemOrderREntity.setCloseTime(new Date());
tbCfOrderDao.update(tbCfOrder); tbCfItemOrderRDao.update(tbCfItemOrderREntity);
//优惠券不为空，则设置状态 //优惠券不为空，则设置状态
if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(couponId)) { if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(couponId)) {
//更新领取记录已领取 //更新领取记录已领取
tbCfTakeCouponDao.updateEnableFlag(userId, couponId, StateConstant.VALID);//int res = tbCfToiCouponDao.updateEnableFlag(userId, couponId, StateConstant.VALID);//int res =
} }
} }
...@@ -285,7 +292,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -285,7 +292,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
//更改订单状态 //更改订单状态
changeOrderState(charge.getId(), tbCfOrderVo); changeOrderState(charge.getId(), tbCfOrderVo);
//修改使用的优惠券的状态 //修改使用的优惠券的状态
if (tbCfOrderVo.getOrderStatus() == 20) { if (tbCfOrderVo.getCouponId() != null && "20".equals(tbCfOrderVo.getOrderStatus())) {
tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId()); tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
} }
//生成流水记录 //生成流水记录
...@@ -369,6 +376,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -369,6 +376,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
Date beginDate = new Date(beginTime * 1000); Date beginDate = new Date(beginTime * 1000);
Date endDate = new Date(endTime * 1000); Date endDate = new Date(endTime * 1000);
List<TbCfItemShippedEntity> orderList = tbCfOrderDao.getDeliveryList(beginDate, endDate); List<TbCfItemShippedEntity> orderList = tbCfOrderDao.getDeliveryList(beginDate, endDate);
// TODO 暂设为赞比亚
for(TbCfItemShippedEntity list:orderList ){
list.setCountry("赞比亚");
}
PageInfo<TbCfItemShippedEntity> pageInfo = new PageInfo<>(orderList); PageInfo<TbCfItemShippedEntity> pageInfo = new PageInfo<>(orderList);
result.setData(pageInfo); result.setData(pageInfo);
} }
...@@ -404,7 +415,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -404,7 +415,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
result.setData(orderEntity); result.setData(orderEntity);
return result; return result;
} }
@Override @Override
public Result deleteOrder(String orderId) { public Result deleteOrder(String orderId) {
Result result = new Result(); Result result = new Result();
...@@ -442,6 +452,21 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -442,6 +452,21 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
return result; return result;
} }
@Override
public Result getDescriptionById(String descriptionId) {
Result<ExpressTemplateVo> result = new Result<>();
ExpressTemplateVo tbCfExpressTemplateEntity= new ExpressTemplateVo();
ExpressTemplateVo expressTemplate=tbCfExpressTemplateDao.getDescriptionById(descriptionId);
tbCfExpressTemplateEntity.setDescriptionId(expressTemplate.getDescriptionId());
tbCfExpressTemplateEntity.setDescriptionName(expressTemplate.getDescriptionName());
tbCfExpressTemplateEntity.setExpressFee(expressTemplate.getExpressFee());
tbCfExpressTemplateEntity.setCountryCode(expressTemplate.getCountryCode());
tbCfExpressTemplateEntity.setCreateTime(expressTemplate.getCreateTime());
result.setData(tbCfExpressTemplateEntity);
return result;
}
/** /**
* 记录财务流水 * 记录财务流水
* *
...@@ -471,15 +496,23 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -471,15 +496,23 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
*/ */
private void changeOrderState(String payId, TbCfOrderVo oldOrder) { private void changeOrderState(String payId, TbCfOrderVo oldOrder) {
//更改订单状态 //更改订单状态
TbCfOrderEntity tbCfOrder = new TbCfOrderEntity(); List<TbCfCartItemDetailVo> itemDetailList = oldOrder.getItemDetailList();
tbCfOrder.setOrderId(oldOrder.getOrderId()); for(TbCfCartItemDetailVo itemList:itemDetailList){
tbCfOrder.setUpdateTime(new Date()); TbCfOrderEntity tbCfOrder = new TbCfOrderEntity();
tbCfOrder.setDealTime(new Date()); TbCfItemOrderREntity itemOrderR= new TbCfItemOrderREntity();
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue()); itemOrderR.setOrderId(oldOrder.getOrderId());
tbCfOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue()); itemOrderR.setItemId(itemList.getItemId());
tbCfOrder.setPayId(payId); itemOrderR.setUpdateTime(new Date());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue()); itemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder); itemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderRDao.update(itemOrderR);
tbCfOrder.setOrderId(oldOrder.getOrderId());
tbCfOrder.setDealTime(new Date());
tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder);
}
} }
...@@ -513,13 +546,11 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -513,13 +546,11 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
deleteItemFromCart(tbCfCartItemDetailList); deleteItemFromCart(tbCfCartItemDetailList);
//将商品id加入订单中,查询订单中的商品 //将商品id加入订单中,查询订单中的商品
addItemOrderRecord(orderId, tbCfCartItemDetailList); updateItemOrderRecord(orderId, tbCfCartItemDetailList);
//使用优惠券 //使用优惠券
if (StringUtils.isNotBlank(definiteOrder.getCouponId())) { if (StringUtils.isNotBlank(definiteOrder.getCouponId())) {
couponUse(definiteOrder.getUserId(), definiteOrder.getCouponId()); couponUse(definiteOrder.getUserId(), definiteOrder.getCouponId());
} }
//把订单放redis中，过期则取消订单 RedisKeyExpirationListener接收 //把订单放redis中，过期则取消订单 RedisKeyExpirationListener接收
long timeout = 1800; long timeout = 1800;
String timeoutStr = domainProperties.getProperty("redis.order.expiredTime"); String timeoutStr = domainProperties.getProperty("redis.order.expiredTime");
...@@ -537,6 +568,19 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -537,6 +568,19 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
} }
private void updateItemOrderRecord(String orderId, List<TbCfCartItemDetailVo> tbCfCartItemDetailList) {
for (TbCfCartItemDetailVo tbCfCartItemDetailVo : tbCfCartItemDetailList) {
TbCfItemOrderREntity tbCfItemOrderR = new TbCfItemOrderREntity();
tbCfItemOrderR.setEnableFlag(StateConstant.VALID);
tbCfItemOrderR.setItemId(tbCfCartItemDetailVo.getItemId());
tbCfItemOrderR.setOrderId(orderId);
tbCfItemOrderR.setUpdateTime(new Date());
tbCfItemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfItemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfItemOrderRDao.update(tbCfItemOrderR);
}
}
/** /**
* 使用优惠券 * 使用优惠券
* *
...@@ -567,7 +611,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -567,7 +611,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
* @param orderId * @param orderId
* @param tbCfCartItemDetailList * @param tbCfCartItemDetailList
*/ */
private void addItemOrderRecord(String orderId, List<TbCfCartItemDetailVo> tbCfCartItemDetailList) { /* private void addItemOrderRecord(String orderId, List<TbCfCartItemDetailVo> tbCfCartItemDetailList) {
List<TbCfItemOrderREntity> itemOrderRList = new ArrayList<>(); List<TbCfItemOrderREntity> itemOrderRList = new ArrayList<>();
for (TbCfCartItemDetailVo tbCfCartItemDetailVo : tbCfCartItemDetailList) { for (TbCfCartItemDetailVo tbCfCartItemDetailVo : tbCfCartItemDetailList) {
TbCfItemOrderREntity tbCfItemOrderR = new TbCfItemOrderREntity(); TbCfItemOrderREntity tbCfItemOrderR = new TbCfItemOrderREntity();
...@@ -575,11 +619,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -575,11 +619,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfItemOrderR.setEnableFlag(StateConstant.VALID); tbCfItemOrderR.setEnableFlag(StateConstant.VALID);
tbCfItemOrderR.setItemId(tbCfCartItemDetailVo.getItemId()); tbCfItemOrderR.setItemId(tbCfCartItemDetailVo.getItemId());
tbCfItemOrderR.setOrderId(orderId); tbCfItemOrderR.setOrderId(orderId);
tbCfItemOrderR.setUpdateTime(new Date());
tbCfItemOrderR.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfItemOrderR.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
itemOrderRList.add(tbCfItemOrderR); itemOrderRList.add(tbCfItemOrderR);
} }
//int res = //int res =
tbCfItemOrderRDao.saveBatch(itemOrderRList); tbCfItemOrderRDao.saveBatch(itemOrderRList);
} }*/
/** /**
* 将商品从购物车删除（伪删除） * 将商品从购物车删除（伪删除）
...@@ -640,11 +687,9 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -640,11 +687,9 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
definiteOrder.setDeliveryName(tbCfAddressEntity.getDeliveryName()); definiteOrder.setDeliveryName(tbCfAddressEntity.getDeliveryName());
definiteOrder.setDeliveryPhone(tbCfAddressEntity.getPhone()); definiteOrder.setDeliveryPhone(tbCfAddressEntity.getPhone());
///////////////////////////////地址 END////////////////////////////// ///////////////////////////////地址 END//////////////////////////////
definiteOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
definiteOrder.setOrderId(IdUtil.createIdbyUUID()); definiteOrder.setOrderId(IdUtil.createIdbyUUID());
definiteOrder.setOrderNo(IdUtil.createLongIdByDate()); definiteOrder.setOrderNo(IdUtil.createLongIdByDate());
definiteOrder.setOrderTime(new Date()); definiteOrder.setOrderTime(new Date());
definiteOrder.setOrderStatus(OrderStatusEnum.PENDING_PAY.getValue());
definiteOrder.setUserId(tbCfUserInfoVo.getUserId()); definiteOrder.setUserId(tbCfUserInfoVo.getUserId());
definiteOrder.setUserName(tbCfUserInfoVo.getNick()); definiteOrder.setUserName(tbCfUserInfoVo.getNick());
definiteOrder.setPayStatus(OrderStatusEnum.PENDING_PAY.getValue()); definiteOrder.setPayStatus(OrderStatusEnum.PENDING_PAY.getValue());
...@@ -670,7 +715,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -670,7 +715,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
itemsPrice = itemsPrice.add(itemSourcePrice.multiply(itemNum)); itemsPrice = itemsPrice.add(itemSourcePrice.multiply(itemNum));
//计算运费 //计算运费
BigDecimal expressCost = getExpressTemplate(tbCfCartItemDetailVo.getItemCategory()); BigDecimal expressCost = getExpressTemplate(tbCfCartItemDetailVo.getItemCategory());
expressCost = expressCost.multiply(itemNum); //expressCost = expressCost.multiply(itemNum);
if("1".equals(itemNum)){
expressCost = expressCost.multiply(itemNum);
}else{
BigDecimal a= BigDecimal.valueOf(1);
BigDecimal dj = expressCost.multiply(itemNum.subtract(a));
expressCost =(dj.divide(BigDecimal.valueOf(2),0,BigDecimal.ROUND_UNNECESSARY)).add(expressCost);
}
totalExpressCost = totalExpressCost.add(expressCost); totalExpressCost = totalExpressCost.add(expressCost);
} }
//计算手续费 //计算手续费
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java
浏览文件 @ 94c5ef9f
...@@ -27,7 +27,6 @@ import com.diaoyun.zion.master.util.EmailHelper; ...@@ -27,7 +27,6 @@ import com.diaoyun.zion.master.util.EmailHelper;
import com.diaoyun.zion.master.util.IdUtil; import com.diaoyun.zion.master.util.IdUtil;
import com.diaoyun.zion.master.util.RandomCodeHelper; import com.diaoyun.zion.master.util.RandomCodeHelper;
import com.diaoyun.zion.master.util.SMSUtil; import com.diaoyun.zion.master.util.SMSUtil;
import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException; import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.mail.EmailException; import org.apache.commons.mail.EmailException;
...@@ -51,8 +50,6 @@ import java.util.Date; ...@@ -51,8 +50,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static com.github.pagehelper.page.PageMethod.startPage;
/** /**
* 用户表Service实现类 * 用户表Service实现类
* *
...@@ -537,12 +534,19 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService { ...@@ -537,12 +534,19 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
} }
@Override @Override
public Result queryUserList(Integer pageNum, Integer pageSize) { public Result queryUserByUserId(String userId) {
Result result = new Result<>(); Result<TbCfUserVo> result = new Result<>();
startPage(pageNum, pageSize); TbCfUserVo tbCfUserVo=new TbCfUserVo();
List<TbCfUserVo> userList = tbCfUserInfoDao.queryUserList(); TbCfUserVo user=tbCfUserInfoDao.queryUserByUserId(userId);
PageInfo<TbCfUserVo> pageInfo = new PageInfo<>(userList); tbCfUserVo.setUserId(user.getUserId());
result.setData(pageInfo); tbCfUserVo.setUserNo(user.getUserNo());
tbCfUserVo.setUserName(user.getUserName());
tbCfUserVo.setPhone(user.getPhone());
tbCfUserVo.setLastLoginTime(user.getLastLoginTime());
tbCfUserVo.setDefaultAddressId(user.getDefaultAddressId());
tbCfUserVo.setDefaultAddressName(user.getDefaultAddressName());
tbCfUserVo.setEnableFlag(user.getEnableFlag());
result.setData(tbCfUserVo);
return result; return result;
} }
......
src/main/java/com/diaoyun/zion/chinafrica/vo/ExpressTemplateVo.java 0 → 100644
浏览文件 @ 94c5ef9f
package com.diaoyun.zion.chinafrica.vo;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
public class ExpressTemplateVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 模板id
*/
private String descriptionId;
/**
* 模板标题
*/
private String descriptionName;
/**
* 快递费
*/
private BigDecimal expressFee;
/**
* 国家编号
*/
private String countryCode;
/**
* 创建日期
*/
private Date createTime;
public String getDescriptionId() {
return descriptionId;
}
public void setDescriptionId(String descriptionId) {
this.descriptionId = descriptionId;
}
public String getDescriptionName() {
return descriptionName;
}
public void setDescriptionName(String descriptionName) {
this.descriptionName = descriptionName;
}
public BigDecimal getExpressFee() {
return expressFee;
}
public void setExpressFee(BigDecimal expressFee) {
this.expressFee = expressFee;
}
public String getCountryCode() {
return countryCode;
}
public void setCountryCode(String countryCode) {
this.countryCode = countryCode;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfCartItemDetailVo.java
浏览文件 @ 94c5ef9f
...@@ -18,7 +18,7 @@ import java.util.Date; ...@@ -18,7 +18,7 @@ import java.util.Date;
public class TbCfCartItemDetailVo implements Serializable { public class TbCfCartItemDetailVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 购物车记录id * 记录id
*/ */
@ApiModelProperty("订单记录id") @ApiModelProperty("订单记录id")
private String ordersId; private String ordersId;
......
src/main/resources/mapper/TbCfCartRecordRDao.xml
浏览文件 @ 94c5ef9f
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfCartRecordRDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfCartRecordRDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity" id="tbCfCartRecordRMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity" id="tbCfCartRecordRMap">
<result property="cartRecordId" column="cart_record_id"/> <result property="cartRecordId" column="cart_record_id"/>
<result property="itemId" column="item_id"/> <result property="itemId" column="item_id"/>
<result property="userId" column="user_id"/> <result property="userId" column="user_id"/>
<result property="checkFlag" column="check_flag"/> <result property="checkFlag" column="check_flag"/>
<result property="enableFlag" column="enable_flag"/> <result property="enableFlag" column="enable_flag"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select select
...@@ -23,41 +23,40 @@ ...@@ -23,41 +23,40 @@
from tb_cf_cart_record_r from tb_cf_cart_record_r
where cart_record_id = #{id} where cart_record_id = #{id}
</select> </select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select select
`cart_record_id`, `cart_record_id`,
`item_id`, `item_id`,
`user_id`, `user_id`,
`check_flag`, `check_flag`,
`enable_flag`, `enable_flag`,
`create_time` `create_time`
from tb_cf_cart_record_r from tb_cf_cart_record_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by cart_record_id desc order by cart_record_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_cart_record_r select count(*) from tb_cf_cart_record_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
insert into tb_cf_cart_record_r( insert into tb_cf_cart_record_r(
`cart_record_id`, `cart_record_id`,
...@@ -74,9 +73,9 @@ ...@@ -74,9 +73,9 @@
#{enableFlag}, #{enableFlag},
#{createTime}) #{createTime})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
update tb_cf_cart_record_r update tb_cf_cart_record_r
<set> <set>
<if test="itemId != null">`item_id` = #{itemId}, </if> <if test="itemId != null">`item_id` = #{itemId}, </if>
<if test="userId != null">`user_id` = #{userId}, </if> <if test="userId != null">`user_id` = #{userId}, </if>
...@@ -85,19 +84,19 @@ ...@@ -85,19 +84,19 @@
</set> </set>
where cart_record_id = #{cartRecordId} where cart_record_id = #{cartRecordId}
</update> </update>
<delete id="delete"> <delete id="delete">
delete from tb_cf_cart_record_r where cart_record_id = #{value} delete from tb_cf_cart_record_r where cart_record_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_cart_record_r where cart_record_id in delete from tb_cf_cart_record_r where cart_record_id in
<foreach item="cartRecordId" collection="array" open="(" separator="," close=")"> <foreach item="cartRecordId" collection="array" open="(" separator="," close=")">
#{cartRecordId} #{cartRecordId}
</foreach> </foreach>
</delete> </delete>
<!--伪删除--> <!--伪删除-->
<delete id="deleteItems"> <delete id="deleteItems">
update tb_cf_cart_record_r set enable_flag=0 where cart_record_id in update tb_cf_cart_record_r set enable_flag=0 where cart_record_id in
<foreach item="cartRecordId" collection="array" open="(" separator="," close=")"> <foreach item="cartRecordId" collection="array" open="(" separator="," close=")">
......
src/main/resources/mapper/TbCfExpressTemplateDao.xml
浏览文件 @ 94c5ef9f
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfExpressTemplateDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfExpressTemplateDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity" id="tbCfExpressTemplateMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity" id="tbCfExpressTemplateMap">
<result property="templateId" column="template_id"/> <result property="templateId" column="template_id"/>
<result property="templateTitle" column="template_title"/> <result property="templateTitle" column="template_title"/>
<result property="itemCategoryId" column="item_category_id"/> <result property="itemCategoryId" column="item_category_id"/>
<result property="expressFee" column="express_fee"/> <result property="expressFee" column="express_fee"/>
<result property="countryCode" column="country_code"/> <result property="countryCode" column="country_code"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
select select
...@@ -26,38 +26,38 @@ ...@@ -26,38 +26,38 @@
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
select select
`template_id`, `template_id`,
`template_title`, `template_title`,
`item_category_id`, `item_category_id`,
`express_fee`, `express_fee`,
`country_code`, `country_code`,
`create_time` `create_time`
from tb_cf_express_template from tb_cf_express_template
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by template_id desc order by template_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_express_template select count(*) from tb_cf_express_template
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
insert into tb_cf_express_template( insert into tb_cf_express_template(
`template_id`, `template_id`,
...@@ -74,9 +74,9 @@ ...@@ -74,9 +74,9 @@
#{countryCode}, #{countryCode},
#{createTime}) #{createTime})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
update tb_cf_express_template update tb_cf_express_template
<set> <set>
<if test="templateTitle != null">`template_title` = #{templateTitle}, </if> <if test="templateTitle != null">`template_title` = #{templateTitle}, </if>
<if test="itemCategoryId != null">`item_category_id` = #{itemCategoryId}, </if> <if test="itemCategoryId != null">`item_category_id` = #{itemCategoryId}, </if>
...@@ -86,16 +86,26 @@ ...@@ -86,16 +86,26 @@
</set> </set>
where template_id = #{templateId} where template_id = #{templateId}
</update> </update>
<delete id="delete"> <delete id="delete">
delete from tb_cf_express_template where template_id = #{value} delete from tb_cf_express_template where template_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_express_template where template_id in delete from tb_cf_express_template where template_id in
<foreach item="templateId" collection="array" open="(" separator="," close=")"> <foreach item="templateId" collection="array" open="(" separator="," close=")">
#{templateId} #{templateId}
</foreach> </foreach>
</delete> </delete>
<select id="getDescriptionById" resultType="com.diaoyun.zion.chinafrica.vo.ExpressTemplateVo">
select
t.template_id descriptionId,
t.template_title descriptionName,
t.item_category_id,
t.express_fee,
t.country_code,
t.create_time
from tb_cf_express_template t
where t.template_id = #{descriptionId}
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TbCfItemDetailDao.xml
浏览文件 @ 94c5ef9f
...@@ -3,22 +3,22 @@ ...@@ -3,22 +3,22 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemDetailDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemDetailDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity" id="tbCfItemDetailMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity" id="tbCfItemDetailMap">
<result property="itemId" column="item_id"/> <result property="itemId" column="item_id"/>
<result property="sourceItemId" column="source_item_id"/> <result property="sourceItemId" column="source_item_id"/>
<result property="stationId" column="station_id"/> <result property="stationId" column="station_id"/>
<result property="stationType" column="station_type"/> <result property="stationType" column="station_type"/>
<result property="itemTitle" column="item_title"/> <result property="itemTitle" column="item_title"/>
<result property="itemNum" column="item_num"/> <result property="itemNum" column="item_num"/>
<result property="itemImg" column="item_img"/> <result property="itemImg" column="item_img"/>
<result property="itemPrice" column="item_price"/> <result property="itemPrice" column="item_price"/>
<result property="itemCategory" column="item_category"/> <result property="itemCategory" column="item_category"/>
<result property="itemSku" column="item_sku"/> <result property="itemSku" column="item_sku"/>
<result property="shopId" column="shop_id"/> <result property="shopId" column="shop_id"/>
<result property="shopName" column="shop_name"/> <result property="shopName" column="shop_name"/>
<result property="shopUrl" column="shop_url"/> <result property="shopUrl" column="shop_url"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
select select
...@@ -39,47 +39,65 @@ ...@@ -39,47 +39,65 @@
from tb_cf_item_detail from tb_cf_item_detail
where item_id = #{id} where item_id = #{id}
</select> </select>
<select id="queryByTitle" resultType="com.diaoyun.zion.chinafrica.vo.TbCfItemDetailVo">
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
select select
`item_id`, `item_id`,
`source_item_id`, `source_item_id`,
`station_id`, `station_id`,
`station_type`, `station_type`,
`item_title`, `item_title`,
`item_num`, `item_num`,
`item_img`, `item_img`,
`item_price`, `item_price`,
`item_category`, `item_category`,
`item_sku`, `item_sku`,
`shop_id`, `shop_id`,
`shop_name`, `shop_name`,
`shop_url`, `shop_url`,
`create_time` `create_time`
from tb_cf_item_detail from tb_cf_item_detail
where item_title = #{itemTitle}
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
select
`item_id`,
`source_item_id`,
`station_id`,
`station_type`,
`item_title`,
`item_num`,
`item_img`,
`item_price`,
`item_category`,
`item_sku`,
`shop_id`,
`shop_name`,
`shop_url`,
`create_time`
from tb_cf_item_detail
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by item_id desc order by item_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_item_detail select count(*) from tb_cf_item_detail
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
insert into tb_cf_item_detail( insert into tb_cf_item_detail(
...@@ -113,9 +131,9 @@ ...@@ -113,9 +131,9 @@
#{shopUrl}, #{shopUrl},
#{createTime}) #{createTime})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
update tb_cf_item_detail update tb_cf_item_detail
<set> <set>
<if test="sourceItemId != null">`source_item_id` = #{sourceItemId}, </if> <if test="sourceItemId != null">`source_item_id` = #{sourceItemId}, </if>
<if test="stationId != null">`station_id` = #{stationId}, </if> <if test="stationId != null">`station_id` = #{stationId}, </if>
...@@ -133,27 +151,27 @@ ...@@ -133,27 +151,27 @@
</set> </set>
where item_id = #{itemId} where item_id = #{itemId}
</update> </update>
<delete id="delete"> <delete id="delete">
delete from tb_cf_item_detail where item_id = #{value} delete from tb_cf_item_detail where item_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_item_detail where item_id in delete from tb_cf_item_detail where item_id in
<foreach item="itemId" collection="array" open="(" separator="," close=")"> <foreach item="itemId" collection="array" open="(" separator="," close=")">
#{itemId} #{itemId}
</foreach> </foreach>
</delete> </delete>
<!--获取用户购物车内商品--> <!--获取用户购物车内商品-->
<select id="getCartItemList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo"> <select id="getCartItemList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfCartItemDetailVo">
select t1.cart_record_id,t1.check_flag,t2.* from tb_cf_cart_record_r t1,tb_cf_item_detail t2 where t1.item_id=t2.item_id select t1.cart_record_id,t1.check_flag,t2.* from tb_cf_cart_record_r t1,tb_cf_item_detail t2 where t1.item_id=t2.item_id
and t1.user_id=#{userId} and t1.user_id=#{userId}
<if test="checkFlag != null"> and t1.check_flag = #{checkFlag}</if> <if test="checkFlag != null"> and t1.check_flag = #{checkFlag}</if>
and t1.enable_flag=1 order by t2.create_time desc and t1.enable_flag=1 order by t2.create_time desc
</select> </select>
<!--改变购物车的商品勾选状态--> <!--改变购物车的商品勾选状态-->
<update id="changeItemState"> <update id="changeItemState">
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId} update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId}
</update> </update>
......
src/main/resources/mapper/TbCfItemOrderRDao.xml
浏览文件 @ 94c5ef9f
...@@ -3,106 +3,160 @@ ...@@ -3,106 +3,160 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap">
<result property="orderItemId" column="order_item_id"/> <result property="orderItemId" column="order_item_id"/>
<result property="itemId" column="item_id"/> <result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="enableFlag" column="enable_flag"/> <result property="enableFlag" column="enable_flag"/>
</resultMap> <result property="orderStatus" column="order_status"/>
<result property="deliveryFlag" column="delivery_flag"/>
<result property="deliveryTime" column="delivery_time"/>
<result property="closeTime" column="close_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select select
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
`order_id`, `order_id`,
`enable_flag` `enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`
from tb_cf_item_order_r from tb_cf_item_order_r
where order_item_id = #{id} where order_item_id = #{id}
</select> </select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select select
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
`order_id`, `order_id`,
`enable_flag` `enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`
from tb_cf_item_order_r from tb_cf_item_order_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by order_item_id desc order by order_item_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_item_order_r select count(*) from tb_cf_item_order_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
insert into tb_cf_item_order_r( insert into tb_cf_item_order_r(
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
`order_id`, `order_id`,
`enable_flag`) `enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`)
values( values(
#{orderItemId}, #{orderItemId},
#{itemId}, #{itemId},
#{orderId}, #{orderId},
#{enableFlag}) #{enableFlag},
#{orderStatus},
#{deliveryFlag},
#{deliveryTime},
#{closeTime},
#{updateTime})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r update tb_cf_item_order_r
<set> <set>
<if test="itemId != null">`item_id` = #{itemId}, </if> <if test="itemId != null">`item_id` = #{itemId}, </if>
<if test="orderId != null">`order_id` = #{orderId}, </if> <if test="orderId != null">`order_id` = #{orderId}, </if>
<if test="enableFlag != null">`enable_flag` = #{enableFlag}</if> <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
<if test="orderStatus != null">`order_status` = #{orderStatus},</if>
<if test="deliveryFlag != null">`delivery_flag`= #{deliveryFlag},</if>
<if test="deliveryTime != null">`delivery_time`= #{deliveryTime},</if>
<if test="closeTime != null">`close_time`= #{closeTime},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set> </set>
where order_item_id = #{orderItemId} where order_item_id = #{orderItemId}
</update> </update>
<update id="updates" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r
<set>
<if test="itemId != null">`item_id` = #{itemId}, </if>
<if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
<if test="orderStatus != null">`order_status` = #{orderStatus},</if>
<if test="deliveryFlag != null">`delivery_flag`= #{deliveryFlag},</if>
<if test="deliveryTime != null">`delivery_time`= #{deliveryTime},</if>
<if test="closeTime != null">`close_time`= #{closeTime},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where order_id = #{orderId}
</update>
<delete id="delete"> <delete id="delete">
delete from tb_cf_item_order_r where order_item_id = #{value} delete from tb_cf_item_order_r where order_item_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_item_order_r where order_item_id in delete from tb_cf_item_order_r where order_item_id in
<foreach item="orderItemId" collection="array" open="(" separator="," close=")"> <foreach item="orderItemId" collection="array" open="(" separator="," close=")">
#{orderItemId} #{orderItemId}
</foreach> </foreach>
</delete> </delete>
<!--批量保存--> <!--批量保存-->
<insert id="saveBatch" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <insert id="saveBatch" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
insert into tb_cf_item_order_r( insert into tb_cf_item_order_r(
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
`order_id`, `order_id`,
`enable_flag`) `enable_flag`,
values `order_status`,
<foreach collection="list" item="item" index="index" separator=","> `delivery_flag`,
( `delivery_time`,
#{item.orderItemId}, `close_time`,
#{item.itemId}, `update_time`)
#{item.orderId}, values
#{item.enableFlag} <foreach collection="list" item="item" index="index" separator=",">
) (
</foreach> #{item.orderItemId},
#{item.itemId},
#{item.orderId},
#{item.enableFlag},
#{item.orderStatus},
#{item.deliveryFlag},
#{item.deliveryTime},
#{item.closeTime},
#{item.updateTime}
)
</foreach>
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/TbCfOrderDao.xml
浏览文件 @ 94c5ef9f
...@@ -3,37 +3,37 @@ ...@@ -3,37 +3,37 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfOrderDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfOrderDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity" id="tbCfOrderMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity" id="tbCfOrderMap">
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="orderNo" column="order_no"/> <result property="orderNo" column="order_no"/>
<result property="orderName" column="order_name"/> <result property="orderName" column="order_name"/>
<result property="orderTime" column="order_time"/> <result property="orderTime" column="order_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="dealTime" column="deal_time"/> <result property="dealTime" column="deal_time"/>
<result property="closeTime" column="close_time"/> <result property="closeTime" column="close_time"/>
<result property="orderStatus" column="order_status"/> <result property="orderStatus" column="order_status"/>
<result property="userId" column="user_id"/> <result property="userId" column="user_id"/>
<result property="userName" column="user_name"/> <result property="userName" column="user_name"/>
<result property="deliveryAddressId" column="delivery_address_id"/> <result property="deliveryAddressId" column="delivery_address_id"/>
<result property="deliveryAddress" column="delivery_address"/> <result property="deliveryAddress" column="delivery_address"/>
<result property="deliveryName" column="delivery_name"/> <result property="deliveryName" column="delivery_name"/>
<result property="deliveryPhone" column="delivery_phone"/> <result property="deliveryPhone" column="delivery_phone"/>
<result property="itemsPrice" column="items_price"/> <result property="itemsPrice" column="items_price"/>
<result property="totalPrice" column="total_price"/> <result property="totalPrice" column="total_price"/>
<result property="realityPay" column="reality_pay"/> <result property="realityPay" column="reality_pay"/>
<result property="deliveryFlag" column="delivery_flag"/> <result property="deliveryFlag" column="delivery_flag"/>
<result property="deliveryTime" column="delivery_time"/> <result property="deliveryTime" column="delivery_time"/>
<result property="expressCost" column="express_cost"/> <result property="expressCost" column="express_cost"/>
<result property="couponId" column="coupon_id"/> <result property="couponId" column="coupon_id"/>
<result property="couponTitle" column="coupon_title"/> <result property="couponTitle" column="coupon_title"/>
<result property="couponPrice" column="coupon_price"/> <result property="couponPrice" column="coupon_price"/>
<result property="fee" column="fee"/> <result property="fee" column="fee"/>
<result property="tax" column="tax"/> <result property="tax" column="tax"/>
<result property="payId" column="pay_id"/> <result property="payId" column="pay_id"/>
<result property="payStatus" column="pay_status"/> <result property="payStatus" column="pay_status"/>
<result property="enableFlag" column="enable_flag"/> <result property="enableFlag" column="enable_flag"/>
<result property="descripitionName" column="descripition_name"></result> <result property="descripitionName" column="descripition_name"></result>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select select
...@@ -82,34 +82,34 @@ ...@@ -82,34 +82,34 @@
</select> </select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select select
`order_id`, `order_id`,
`order_no`, `order_no`,
`order_name`, `order_name`,
`order_time`, `order_time`,
`update_time`, `update_time`,
`deal_time`, `deal_time`,
`close_time`, `close_time`,
`order_status`, `order_status`,
`user_id`, `user_id`,
`user_name`, `user_name`,
`delivery_address_id`, `delivery_address_id`,
`delivery_address`, `delivery_address`,
`delivery_name`, `delivery_name`,
`delivery_phone`, `delivery_phone`,
`items_price`, `items_price`,
`total_price`, `total_price`,
`reality_pay`, `reality_pay`,
`delivery_flag`, `delivery_flag`,
`delivery_time`, `delivery_time`,
`express_cost`, `express_cost`,
`coupon_id`, `coupon_id`,
`coupon_title`, `coupon_title`,
`coupon_price`, `coupon_price`,
`fee`, `fee`,
`tax`, `tax`,
`pay_id`, `pay_id`,
`pay_status`, `pay_status`,
`enable_flag`, `enable_flag`,
`descripition_name` `descripition_name`
from tb_cf_order from tb_cf_order
WHERE 1=1 WHERE 1=1
...@@ -117,27 +117,27 @@ ...@@ -117,27 +117,27 @@
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by order_id desc order by order_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_order select count(*) from tb_cf_order
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<select id="queryCouponPrice" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity"> <select id="queryCouponPrice" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
select t2.* from tb_cf_toicoupon t1 left join tb_cf_coupon t2 on t2.coupon_id=t1.coupon_id where t1.toitable_id=#{toitableId} select t2.* from tb_cf_toicoupon t1 left join tb_cf_coupon t2 on t2.coupon_id=t1.coupon_id where t1.toitable_id=#{toitableId}
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
...@@ -202,9 +202,9 @@ ...@@ -202,9 +202,9 @@
#{enableFlag}, #{enableFlag},
#{descripitionName}) #{descripitionName})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
update tb_cf_order update tb_cf_order
<set> <set>
<if test="orderNo != null">`order_no` = #{orderNo}, </if> <if test="orderNo != null">`order_no` = #{orderNo}, </if>
<if test="orderName != null">`order_name` = #{orderName}, </if> <if test="orderName != null">`order_name` = #{orderName}, </if>
...@@ -241,25 +241,25 @@ ...@@ -241,25 +241,25 @@
<delete id="delete"> <delete id="delete">
delete from tb_cf_order where order_id = #{value} delete from tb_cf_order where order_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_order where order_id in delete from tb_cf_order where order_id in
<foreach item="orderId" collection="array" open="(" separator="," close=")"> <foreach item="orderId" collection="array" open="(" separator="," close=")">
#{orderId} #{orderId}
</foreach> </foreach>
</delete> </delete>
<!--获取用户订单数据--> <!--获取用户订单数据-->
<select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select * from tb_cf_order where user_id=#{userId} and enable_flag=1 select * from tb_cf_order where user_id=#{userId} and enable_flag=1
<if test="orderStatus != null"> and order_status = #{orderStatus} </if> <if test="orderStatus != null"> and order_status = #{orderStatus} </if>
order by order_time desc order by order_time desc
</select> </select>
<select id="getOrdersId" resultType="String"> <select id="getOrdersId" resultType="String">
select r.order_item_id ordersId from tb_cf_item_order_r r where r.order_id=#{orderId} and r.item_id=#{itemId} select r.order_item_id ordersId from tb_cf_item_order_r r where r.order_id=#{orderId} and r.item_id=#{itemId}
</select> </select>
<!--根据订单id，获取订单内商品详情--> <!--根据订单id，获取订单内商品详情-->
<select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity"> <select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
SELECT SELECT
t1.*, t1.*,
t5.template_title descripitionName t5.template_title descripitionName
...@@ -280,6 +280,7 @@ ...@@ -280,6 +280,7 @@
t1.item_num, t1.item_num,
t1.item_price, t1.item_price,
t1.item_category, t1.item_category,
t5.template_id descripitionId,
t5.template_title descripitionName t5.template_title descripitionName
FROM FROM
tb_cf_item_detail t1 tb_cf_item_detail t1
...@@ -288,11 +289,11 @@ ...@@ -288,11 +289,11 @@
LEFT JOIN tb_cf_platform_order t4 on t3.order_id=t4.order_id LEFT JOIN tb_cf_platform_order t4 on t3.order_id=t4.order_id
LEFT JOIN tb_cf_express_template t5 on t5.template_id=t4.descripition_id LEFT JOIN tb_cf_express_template t5 on t5.template_id=t4.descripition_id
WHERE WHERE
t2.enable_flag = 1 and t2.order_item_id=#{order_id} t2.enable_flag = 1 and t2.order_item_id=#{orderId}
</select> </select>
<!--获取付款订单--> <!--获取付款订单-->
<select id="getOrderListByTime" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"> <select id="getOrderListByTime" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select o.user_id,r.order_item_id order_id,o.deal_time from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id where pay_status=20 and o.enable_flag=1 select o.user_id,r.order_item_id order_id,o.deal_time from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id where pay_status=20 and i.enable_flag=1
and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate} and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
</select> </select>
...@@ -302,16 +303,18 @@ ...@@ -302,16 +303,18 @@
o.user_id, o.user_id,
r.order_item_id order_id, r.order_item_id order_id,
p.create_time deliveryTime, p.create_time deliveryTime,
a.address_country_name countryName,
o.delivery_address, o.delivery_address,
p.p_express_number expressId, p.p_express_number expressId,
i.item_id itemId, i.item_id itemId,
e.template_title descripitionName i.item_num,
p.descripition_id
from tb_cf_order o from tb_cf_order o
LEFT JOIN tb_cf_platform_order p on o.order_id=p.order_id LEFT JOIN tb_cf_platform_order p on o.order_id=p.order_id
left join tb_cf_item_order_r r on r.order_id=o.order_id left join tb_cf_item_order_r r on r.order_id=o.order_id
LEFT JOIN tb_cf_item_detail i on r.item_id=i.item_id LEFT JOIN tb_cf_item_detail i on r.item_id=i.item_id
LEFT JOIN tb_cf_express_template e on e.template_id=p.descripition_id LEFT JOIN tb_cf_address a on a.user_id=o.user_id
where o.delivery_flag=20 and o.enable_flag=1 where r.delivery_flag=10 and r.enable_flag=1
and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate} and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
</select> </select>
......
src/main/resources/mapper/TbCfUserInfoDao.xml
浏览文件 @ 94c5ef9f
...@@ -53,20 +53,7 @@ ...@@ -53,20 +53,7 @@
from tb_cf_user_info from tb_cf_user_info
where user_id = #{id} where user_id = #{id}
</select> </select>
<!--提供给第三方的接口查询用户列表 -->
<select id="queryUserList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfUserVo">
select
u.user_id,
u.user_no,
u.nick user_name,
u.phone,
u.last_login_time,
a.address_id defaultAddressId,
a.address_detail defaultAddressName,
u.enable_flag
from tb_cf_user_info u left join tb_cf_address a on u.user_id=a.user_id
WHERE 1=1
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity">
select select
`user_id`, `user_id`,
...@@ -229,5 +216,18 @@ ...@@ -229,5 +216,18 @@
<update id="updatePassWord"> <update id="updatePassWord">
update tb_cf_user_info set password=#{newPassword} where user_id=#{userId} update tb_cf_user_info set password=#{newPassword} where user_id=#{userId}
</update> </update>
<!--提供给第三方的 ，根据userId，查找需要的信息-->
<select id="queryUserByUserId" resultType="com.diaoyun.zion.chinafrica.vo.TbCfUserVo">
select
u.user_id,
u.user_no,
u.nick user_name,
u.phone,
u.last_login_time,
a.address_id defaultAddressId,
a.address_detail defaultAddressName,
u.enable_flag
from tb_cf_user_info u left join tb_cf_address a on u.user_id=a.user_id
WHERE 1=1 and u.user_id=#{userId}
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论