Skip to content

Z
zion
提交 f470d559 authored 作者: 梁业锦's avatar 梁业锦 💬
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 d3735af4 caf52556
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 743 行增加 和 388 行删除
src/main/java/com/diaoyun/zion/chinafrica/api/ThirdPartyController.java
浏览文件 @ f470d559
......@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/chinafrica/api")
public class ThirdPartyController {
private static Logger logger= LoggerFactory.getLogger(ThirdPartyController.class);
private static Logger logger= LoggerFactory.getLogger(ThirdPartyController.class);
@Autowired
@Autowired
private TbCfOrderService tbCfOrderService;
@Autowired
private TbCfUserInfoService tbCfUserInfoService;
......@@ -46,7 +46,7 @@ public class ThirdPartyController {
return tbCfOrderService.getOrderListByTime(beginTime,endTime,pageNum,pageSize);
}
/**
/**
*获取某段时间已发货订单数据
*/
@ApiOperation(value = "获取某段时间已发货订单数据")
......@@ -65,7 +65,9 @@ public class ThirdPartyController {
}
/**
* 根据订单号获取详细订单数据
* 根据订单号获取详细订单数据2
*
*
*/
@ApiOperation(value = "根据订单号获取详细订单数据")
@GetMapping(value ="/order/detail/{orderId}")
......@@ -73,18 +75,20 @@ public class ThirdPartyController {
return tbCfOrderService.getOrderDetailThird(orderId);
}
/**
* 获取用户列表
* 根据userId获取用户信息
* @return
*/
@ApiOperation(value = "获取用户列表")
@GetMapping(value ="/user")
public Result getAllUser( @ApiParam(value = "页数") @RequestParam(required = false) Integer pageNum,
@ApiParam(value ="每页大小 默认100") @RequestParam(required = false) Integer pageSize) {
if (pageNum == null) {
pageNum = 1;
}
if (pageSize == null) {
pageSize = 100;
}
return tbCfUserInfoService.queryUserList(pageNum,pageSize);
@GetMapping(value ="/user/{userId}")
public Result getAllUser(@PathVariable("userId")String userId) {
return tbCfUserInfoService.queryUserByUserId(userId);
}
/**
* 获取报关品名
*/
@ApiOperation(value = "获取报关品名")
@GetMapping(value ="/description/{descriptionId}")
public Result getDescriptionList(@PathVariable("descriptionId")String descriptionId) {
return tbCfOrderService.getDescriptionById(descriptionId);
}
}
src/main/java/com/diaoyun/zion/chinafrica/controller/FlutterWaveController.java
浏览文件 @ f470d559
......@@ -36,14 +36,14 @@ public class FlutterWaveController {
/**
* 验证付款
*
* @param txref
* @param
* @param orderId
* @return
*/
@PostMapping("/verifyPay")
public Result verifyPay(@ApiParam("交易唯一标识") @RequestParam("txref") String txref, @ApiParam("订单ID") @RequestParam("orderId") String orderId) {
public Result verifyPay(@ApiParam("订单ID") @RequestParam("orderId") String orderId) {
return flutterWaveService.verifyPay(txref, orderId);
return flutterWaveService.verifyPay(orderId);
}
......@@ -57,10 +57,10 @@ public class FlutterWaveController {
public Result refund(@RequestBody FlutterWaveCard flutterWaveCard) {
return flutterWaveService.refund(flutterWaveCard);
}
//
// @GetMapping("/queryPayParams")
// public Result queryPayParams(@ApiParam("用户ID") @RequestParam("userId") String userId) {
//
//
// }
@GetMapping("/queryParams")
public Result queryParams(@ApiParam("用户ID") @RequestParam("userId") String userId) {
return flutterWaveService.queryParams(userId);
}
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfExpressTemplateDao.java
浏览文件 @ f470d559
package com.diaoyun.zion.chinafrica.dao;
import com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity;
import com.diaoyun.zion.chinafrica.vo.ExpressTemplateVo;
import com.diaoyun.zion.master.dao.BaseDao;
import java.util.List;
/**
* 运费模板Dao
*
......@@ -11,4 +14,7 @@ import com.diaoyun.zion.master.dao.BaseDao;
*/
public interface TbCfExpressTemplateDao extends BaseDao<TbCfExpressTemplateEntity> {
List<TbCfExpressTemplateEntity> getDescriptionList();
ExpressTemplateVo getDescriptionById(String descriptionId);
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfItemOrderRDao.java
浏览文件 @ f470d559
......@@ -13,10 +13,14 @@ import java.util.List;
*/
public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> {
TbCfItemOrderREntity queryByTitle(String itemTitle);
/**
* 批量保存
* @param itemOrderRList
* @return
*/
int saveBatch(List<TbCfItemOrderREntity> itemOrderRList);
int updates(TbCfItemOrderREntity itemOrderR);
}
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfUserInfoDao.java
浏览文件 @ f470d559
......@@ -5,8 +5,6 @@ import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity;
import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;
import com.diaoyun.zion.master.dao.BaseDao;
import java.util.List;
/**
* 用户表Dao
*
......@@ -60,8 +58,8 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
TbCfUserInfoEntity findByEmail(String email);
/**
* 提供给第三方的用户列表
* 根据userID获取用户信息
* @return
*/
List<TbCfUserVo> queryUserList();
TbCfUserVo queryUserByUserId(String userId);
}
src/main/java/com/diaoyun/zion/chinafrica/entity/FlutterKey.java 0 → 100644
浏览文件 @ f470d559
package com.diaoyun.zion.chinafrica.entity;
import java.util.List;
/**
* @Auther: wudepeng
* @Date: 2019/11/28
* @Description:ǰ֧
*/
public class FlutterKey {
private String public_key;
private List<TbCfUserInfoEntity> userInfo;
public String getPublic_key() {
return public_key;
}
public void setPublic_key(String public_key) {
this.public_key = public_key;
}
public List<TbCfUserInfoEntity> getUserInfo() {
return userInfo;
}
public void setUserInfo(List<TbCfUserInfoEntity> userInfo) {
this.userInfo = userInfo;
}
}
src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemOrderREntity.java
浏览文件 @ f470d559
......@@ -30,6 +30,14 @@ public class TbCfItemOrderREntity implements Serializable {
*/
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 {
public Integer getEnableFlag() {
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
浏览文件 @ f470d559
package com.diaoyun.zion.chinafrica.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -40,11 +39,18 @@ public class TbCfItemShippedEntity implements Serializable {
* 商品ID
*/
private String itemId;
/**
* 商品ID
*/
private String itemNum;
/**
* 国家
*/
private String country;
/**
* 商品品名
*/
private String descripitionName;
private String descripitionId;
public static long getSerialVersionUID() {
return serialVersionUID;
......@@ -58,12 +64,12 @@ public class TbCfItemShippedEntity implements Serializable {
this.itemId = itemId;
}
public String getDescripitionName() {
return descripitionName;
public String getDescripitionId() {
return descripitionId;
}
public void setDescripitionName(String descripitionName) {
this.descripitionName = descripitionName;
public void setDescripitionId(String descripitionId) {
this.descripitionId = descripitionId;
}
/**
......@@ -111,4 +117,20 @@ public class TbCfItemShippedEntity implements Serializable {
public void setExpressId(String 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
浏览文件 @ f470d559
......@@ -13,7 +13,10 @@ import java.util.Date;
*/
public class TbCfOrderEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private String ordersId;
/**
* 订单id
*/
......@@ -496,4 +499,12 @@ public class TbCfOrderEntity implements Serializable {
public void setEnableFlag(Integer 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/FlutterWaveService.java
浏览文件 @ f470d559
......@@ -15,7 +15,11 @@ import java.io.IOException;
* @Description:
*/
public interface FlutterWaveService {
public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard);
Result verifyPay(String txref,String orderId);
public Result refund(FlutterWaveCard flutterWaveCard);
Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard);
Result verifyPay(String orderId);
Result refund(FlutterWaveCard flutterWaveCard);
Result queryParams(String userId);
}
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java
浏览文件 @ f470d559
......@@ -95,7 +95,7 @@ public interface TbCfOrderService {
* @param orderStatus 订单状态 OrderStatusEnum
* @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 {
*/
Result getOrderDetail(String orderId);
Result getDescriptionById(String descriptionId);
}
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfUserInfoService.java
浏览文件 @ f470d559
......@@ -81,7 +81,7 @@ public interface TbCfUserInfoService {
* 发送注册验证码
* @param email
* @return
*/
*/
Integer sendRegisterIdentifyCode(String email,String nick) throws EmailException, TemplateException, IOException;
/**
......@@ -177,5 +177,5 @@ public interface TbCfUserInfoService {
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
浏览文件 @ f470d559
......@@ -3,13 +3,14 @@ package com.diaoyun.zion.chinafrica.service.impl;
import com.alibaba.fastjson.JSON;
import com.diaoyun.zion.chinafrica.constant.KeyConstant;
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.TbCfToiCouponDao;
import com.diaoyun.zion.chinafrica.entity.TbCfFinanceEntity;
import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
import com.diaoyun.zion.chinafrica.entity.*;
import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
import com.diaoyun.zion.chinafrica.service.FlutterWaveService;
import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
import com.diaoyun.zion.chinafrica.vo.FlutterWaveCard;
import com.diaoyun.zion.chinafrica.vo.TbCfFinanceVo;
import com.diaoyun.zion.chinafrica.vo.TbCfOrderVo;
......@@ -33,9 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
/**
* @Auther: wudepeng
......@@ -50,7 +49,12 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
@Autowired
private TbCfOrderDao tbCfOrderDao;
@Autowired
private TbCfToiCouponDao TbCfToiCouponDao;
private TbCfToiCouponDao tbCfToiCouponDao;
@Autowired
private TbCfItemOrderRDao tbCfItemOrderRDao;
@Autowired
private TbCfUserInfoService tbCfUserInfoService;
@Autowired
private DomainProperties domainProperties;
@Resource
......@@ -62,7 +66,8 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
//校验API
private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
//测试API
//private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
/**
* 使用卡号支付(预支付)
......@@ -97,7 +102,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
.setExpiryyear(flutterWaveCard.getYear())
.setExpirymonth(flutterWaveCard.getMonth())
.setEmail(flutterWaveCard.getEmail())
.setTxRef("Afri-shop" + new Date().getTime());
.setTxRef(orderId);
JSONObject chargevisa = ch.chargeVisaAndIntl();
result.setData(chargevisa);
} catch (Exception e) {
......@@ -115,17 +120,16 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
/**
* 校验支付
*
* @param txref
* @param orderId
* @return
*/
@Override
public Result verifyPay(String txref, String orderId) {
public Result verifyPay(String orderId) {
Result result = new Result();
try {
TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
Map<String, Object> map = new HashMap<>();
map.put("txref", txref);
map.put("txref", orderId);
map.put("SECKEY", domainProperties.getProperty("flutterwave.secret.key"));
String data = HttpClientUtil.sendPostWithBodyParameter(VERIFY_PAY_URL, map);
com.alibaba.fastjson.JSONObject object = JSON.parseObject(data);
......@@ -139,25 +143,25 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
if (tbCfOrderVo != null) {
changeOrderState(paymentid, tbCfOrderVo);
//修改优惠券状态
if (tbCfOrderVo.getCouponId() != null && "20".equals(tbCfOrderVo.getOrderStatus())) {
TbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
if (tbCfOrderVo.getCouponId() != null && OrderStatusEnum.PAID.getValue().equals(tbCfOrderVo.getOrderStatus())) {
tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
}
//生成支付流水
TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo);
TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
BeanUtils.copyProperties(finance, tbCfFinanceVo);
logger.info(tbCfOrderVo.getUserName() + ":Pay for success! The order number is:" + tbCfOrderVo.getOrderId());
//清空订单
removeRedisCache(tbCfOrderVo);
}
result.setData(JSON.parseObject(data));
result.setCode(ResultCodeEnum.SUCCESS.getCode()).setMessage("payment success!");
logger.info("payment success! The flutterwave txref is:" + txref);
logger.info(tbCfOrderVo.getUserName() + ":Pay for success! The order number is:" + tbCfOrderVo.getOrderId());
} else {
result.setData(JSON.parseObject(data));
//支付失败
result.setCode(ResultCodeEnum.ORDER_PAY_ERROR.getCode()).setMessage("payment failure!");
logger.error("payment failure! The flutterwave txref is:" + txref);
logger.error(tbCfOrderVo.getUserName() + ":Pay for success! The order number is:" + tbCfOrderVo.getOrderId());
}
} catch (Exception e) {
result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode()).setMessage(e.getMessage());
......@@ -203,6 +207,20 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
return result;
}
@Override
public Result queryParams(String userId) {
Result result = new Result();
List<TbCfUserInfoEntity> list = new ArrayList<>();
FlutterKey key = new FlutterKey();
String public_key = domainProperties.getProperty("flutterwave.public.key");
TbCfUserInfoEntity userInfo = tbCfUserInfoService.queryObject(userId);
list.add(userInfo);
key.setPublic_key(public_key);
key.setUserInfo(list);
result.setData(key).setMessage(ResultCodeEnum.SUCCESS.getDesc());
return result;
}
/**
* 清空订单缓存
......@@ -227,13 +245,18 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
*/
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();
tbCfOrder.setOrderId(oldOrder.getOrderId());
tbCfOrder.setUpdateTime(new Date());
tbCfOrder.setDealTime(new Date());
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder);
}
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/PayPalServiceImpl.java
浏览文件 @ f470d559
package com.diaoyun.zion.chinafrica.service.impl;
import com.diaoyun.zion.chinafrica.constant.KeyConstant;
import com.diaoyun.zion.chinafrica.dao.TbCfFinanceDao;
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.dao.*;
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.enums.DeliveryStatusEnum;
import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
......@@ -57,7 +55,8 @@ public class PayPalServiceImpl implements PayPalService {
private TbCfIssueCouponDao tbCfIssueCouponDao;
@Autowired
private TbCfToiCouponDao tbCfToiCouponDao;
@Autowired
private TbCfItemOrderRDao tbCfItemOrderRDao;
private String ORDER_ID = "";
@Override
......@@ -215,13 +214,18 @@ public class PayPalServiceImpl implements PayPalService {
*/
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();
tbCfOrder.setOrderId(oldOrder.getOrderId());
tbCfOrder.setUpdateTime(new Date());
tbCfOrder.setDealTime(new Date());
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setDeliveryFlag(DeliveryStatusEnum.PROCESSING.getValue());
tbCfOrder.setPayId(payId);
tbCfOrder.setOrderStatus(OrderStatusEnum.PAID.getValue());
tbCfOrder.setPayStatus(OrderStatusEnum.PAID.getValue());
tbCfOrderDao.update(tbCfOrder);
}
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfItemDetailServiceImpl.java
浏览文件 @ f470d559
......@@ -46,6 +46,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
@Autowired
private TbCfExpTemKeywordDao tbCfExpTemKeywordDao;
@Resource(name="redisTokenManager")
private TokenManager tokenManager;
......@@ -191,7 +192,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
if ("0".equals(tbCfExpressTemplateList.size())) {
String[] split = keyword.split("");
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]);
totalTemplateSet.addAll(tbCfExpressTemplateLists);
}
......
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java
浏览文件 @ f470d559
......@@ -27,7 +27,6 @@ import com.diaoyun.zion.master.util.EmailHelper;
import com.diaoyun.zion.master.util.IdUtil;
import com.diaoyun.zion.master.util.RandomCodeHelper;
import com.diaoyun.zion.master.util.SMSUtil;
import com.github.pagehelper.PageInfo;
import freemarker.template.TemplateException;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.mail.EmailException;
......@@ -51,8 +50,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.github.pagehelper.page.PageMethod.startPage;
/**
* 用户表Service实现类
*
......@@ -537,12 +534,19 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
}
@Override
public Result queryUserList(Integer pageNum, Integer pageSize) {
Result result = new Result<>();
startPage(pageNum, pageSize);
List<TbCfUserVo> userList = tbCfUserInfoDao.queryUserList();
PageInfo<TbCfUserVo> pageInfo = new PageInfo<>(userList);
result.setData(pageInfo);
public Result queryUserByUserId(String userId) {
Result<TbCfUserVo> result = new Result<>();
TbCfUserVo tbCfUserVo=new TbCfUserVo();
TbCfUserVo user=tbCfUserInfoDao.queryUserByUserId(userId);
tbCfUserVo.setUserId(user.getUserId());
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;
}
......
src/main/java/com/diaoyun/zion/chinafrica/vo/ExpressTemplateVo.java 0 → 100644
浏览文件 @ f470d559
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
浏览文件 @ f470d559
......@@ -18,7 +18,7 @@ import java.util.Date;
public class TbCfCartItemDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 购物车记录id
* 记录id
*/
@ApiModelProperty("订单记录id")
private String ordersId;
......
src/main/resources/mapper/TbCfCartRecordRDao.xml
浏览文件 @ f470d559
......@@ -3,14 +3,14 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfCartRecordRDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity" id="tbCfCartRecordRMap">
<result property="cartRecordId" column="cart_record_id"/>
<result property="itemId" column="item_id"/>
<result property="userId" column="user_id"/>
<result property="checkFlag" column="check_flag"/>
<result property="enableFlag" column="enable_flag"/>
<result property="createTime" column="create_time"/>
</resultMap>
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity" id="tbCfCartRecordRMap">
<result property="cartRecordId" column="cart_record_id"/>
<result property="itemId" column="item_id"/>
<result property="userId" column="user_id"/>
<result property="checkFlag" column="check_flag"/>
<result property="enableFlag" column="enable_flag"/>
<result property="createTime" column="create_time"/>
</resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select
......@@ -23,41 +23,40 @@
from tb_cf_cart_record_r
where cart_record_id = #{id}
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
select
`cart_record_id`,
`item_id`,
`user_id`,
`check_flag`,
`enable_flag`,
`create_time`
`cart_record_id`,
`item_id`,
`user_id`,
`check_flag`,
`enable_flag`,
`create_time`
from tb_cf_cart_record_r
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by cart_record_id desc
order by cart_record_id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_cart_record_r
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
insert into tb_cf_cart_record_r(
`cart_record_id`,
......@@ -74,9 +73,9 @@
#{enableFlag},
#{createTime})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCartRecordREntity">
update tb_cf_cart_record_r
update tb_cf_cart_record_r
<set>
<if test="itemId != null">`item_id` = #{itemId}, </if>
<if test="userId != null">`user_id` = #{userId}, </if>
......@@ -85,19 +84,19 @@
</set>
where cart_record_id = #{cartRecordId}
</update>
<delete id="delete">
delete from tb_cf_cart_record_r where cart_record_id = #{value}
</delete>
<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=")">
#{cartRecordId}
</foreach>
</delete>
<!--伪删除-->
<!--伪删除-->
<delete id="deleteItems">
update tb_cf_cart_record_r set enable_flag=0 where cart_record_id in
<foreach item="cartRecordId" collection="array" open="(" separator="," close=")">
......
src/main/resources/mapper/TbCfExpressTemplateDao.xml
浏览文件 @ f470d559
......@@ -3,14 +3,14 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfExpressTemplateDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity" id="tbCfExpressTemplateMap">
<result property="templateId" column="template_id"/>
<result property="templateTitle" column="template_title"/>
<result property="itemCategoryId" column="item_category_id"/>
<result property="expressFee" column="express_fee"/>
<result property="countryCode" column="country_code"/>
<result property="createTime" column="create_time"/>
</resultMap>
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity" id="tbCfExpressTemplateMap">
<result property="templateId" column="template_id"/>
<result property="templateTitle" column="template_title"/>
<result property="itemCategoryId" column="item_category_id"/>
<result property="expressFee" column="express_fee"/>
<result property="countryCode" column="country_code"/>
<result property="createTime" column="create_time"/>
</resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
select
......@@ -26,38 +26,38 @@
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
select
`template_id`,
`template_title`,
`item_category_id`,
`express_fee`,
`country_code`,
`create_time`
`template_id`,
`template_title`,
`item_category_id`,
`express_fee`,
`country_code`,
`create_time`
from tb_cf_express_template
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by template_id desc
order by template_id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_express_template
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
insert into tb_cf_express_template(
`template_id`,
......@@ -74,9 +74,9 @@
#{countryCode},
#{createTime})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfExpressTemplateEntity">
update tb_cf_express_template
update tb_cf_express_template
<set>
<if test="templateTitle != null">`template_title` = #{templateTitle}, </if>
<if test="itemCategoryId != null">`item_category_id` = #{itemCategoryId}, </if>
......@@ -86,16 +86,26 @@
</set>
where template_id = #{templateId}
</update>
<delete id="delete">
delete from tb_cf_express_template where template_id = #{value}
</delete>
<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=")">
#{templateId}
</foreach>
</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>
\ No newline at end of file
src/main/resources/mapper/TbCfItemDetailDao.xml
浏览文件 @ f470d559
......@@ -3,22 +3,22 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemDetailDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity" id="tbCfItemDetailMap">
<result property="itemId" column="item_id"/>
<result property="sourceItemId" column="source_item_id"/>
<result property="stationId" column="station_id"/>
<result property="stationType" column="station_type"/>
<result property="itemTitle" column="item_title"/>
<result property="itemNum" column="item_num"/>
<result property="itemImg" column="item_img"/>
<result property="itemPrice" column="item_price"/>
<result property="itemCategory" column="item_category"/>
<result property="itemSku" column="item_sku"/>
<result property="shopId" column="shop_id"/>
<result property="shopName" column="shop_name"/>
<result property="shopUrl" column="shop_url"/>
<result property="createTime" column="create_time"/>
</resultMap>
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity" id="tbCfItemDetailMap">
<result property="itemId" column="item_id"/>
<result property="sourceItemId" column="source_item_id"/>
<result property="stationId" column="station_id"/>
<result property="stationType" column="station_type"/>
<result property="itemTitle" column="item_title"/>
<result property="itemNum" column="item_num"/>
<result property="itemImg" column="item_img"/>
<result property="itemPrice" column="item_price"/>
<result property="itemCategory" column="item_category"/>
<result property="itemSku" column="item_sku"/>
<result property="shopId" column="shop_id"/>
<result property="shopName" column="shop_name"/>
<result property="shopUrl" column="shop_url"/>
<result property="createTime" column="create_time"/>
</resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
select
......@@ -39,47 +39,65 @@
from tb_cf_item_detail
where item_id = #{id}
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
<select id="queryByTitle" resultType="com.diaoyun.zion.chinafrica.vo.TbCfItemDetailVo">
select
`item_id`,
`item_id`,
`source_item_id`,
`station_id`,
`station_type`,
`item_title`,
`item_num`,
`item_img`,
`item_price`,
`item_category`,
`item_sku`,
`station_id`,
`station_type`,
`item_title`,
`item_num`,
`item_img`,
`item_price`,
`item_category`,
`item_sku`,
`shop_id`,
`shop_name`,
`shop_url`,
`shop_name`,
`shop_url`,
`create_time`
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
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by item_id desc
order by item_id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_item_detail
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
insert into tb_cf_item_detail(
......@@ -113,9 +131,9 @@
#{shopUrl},
#{createTime})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
update tb_cf_item_detail
update tb_cf_item_detail
<set>
<if test="sourceItemId != null">`source_item_id` = #{sourceItemId}, </if>
<if test="stationId != null">`station_id` = #{stationId}, </if>
......@@ -133,27 +151,27 @@
</set>
where item_id = #{itemId}
</update>
<delete id="delete">
delete from tb_cf_item_detail where item_id = #{value}
</delete>
<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=")">
#{itemId}
</foreach>
</delete>
<!--获取用户购物车内商品-->
<!--获取用户购物车内商品-->
<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
and t1.user_id=#{userId}
<if test="checkFlag != null"> and t1.check_flag = #{checkFlag}</if>
and t1.enable_flag=1 order by t2.create_time desc
</select>
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}
<if test="checkFlag != null"> and t1.check_flag = #{checkFlag}</if>
and t1.enable_flag=1 order by t2.create_time desc
</select>
<!--改变购物车的商品勾选状态-->
<!--改变购物车的商品勾选状态-->
<update id="changeItemState">
update tb_cf_cart_record_r set check_flag=#{checkFlag} where cart_record_id=#{cartRecordId}
</update>
......
src/main/resources/mapper/TbCfItemOrderRDao.xml
浏览文件 @ f470d559
......@@ -3,106 +3,160 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap">
<result property="orderItemId" column="order_item_id"/>
<result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/>
<result property="enableFlag" column="enable_flag"/>
</resultMap>
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap">
<result property="orderItemId" column="order_item_id"/>
<result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/>
<result property="enableFlag" column="enable_flag"/>
<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
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`
`enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`
from tb_cf_item_order_r
where order_item_id = #{id}
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`
from tb_cf_item_order_r
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by order_item_id desc
order by order_item_id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_item_order_r
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
insert into tb_cf_item_order_r(
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`)
`enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`)
values(
#{orderItemId},
#{itemId},
#{orderId},
#{enableFlag})
#{enableFlag},
#{orderStatus},
#{deliveryFlag},
#{deliveryTime},
#{closeTime},
#{updateTime})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r
update tb_cf_item_order_r
<set>
<if test="itemId != null">`item_id` = #{itemId}, </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>
where order_item_id = #{orderItemId}
</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 from tb_cf_item_order_r where order_item_id = #{value}
</delete>
<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=")">
#{orderItemId}
</foreach>
</delete>
<!--批量保存-->
<!--批量保存-->
<insert id="saveBatch" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
insert into tb_cf_item_order_r(
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`)
values
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.orderItemId},
#{item.itemId},
#{item.orderId},
#{item.enableFlag}
)
</foreach>
insert into tb_cf_item_order_r(
`order_item_id`,
`item_id`,
`order_id`,
`enable_flag`,
`order_status`,
`delivery_flag`,
`delivery_time`,
`close_time`,
`update_time`)
values
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.orderItemId},
#{item.itemId},
#{item.orderId},
#{item.enableFlag},
#{item.orderStatus},
#{item.deliveryFlag},
#{item.deliveryTime},
#{item.closeTime},
#{item.updateTime}
)
</foreach>
</insert>
</insert>
</mapper>
\ No newline at end of file
src/main/resources/mapper/TbCfOrderDao.xml
浏览文件 @ f470d559
......@@ -3,37 +3,37 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfOrderDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity" id="tbCfOrderMap">
<result property="orderId" column="order_id"/>
<result property="orderNo" column="order_no"/>
<result property="orderName" column="order_name"/>
<result property="orderTime" column="order_time"/>
<result property="updateTime" column="update_time"/>
<result property="dealTime" column="deal_time"/>
<result property="closeTime" column="close_time"/>
<result property="orderStatus" column="order_status"/>
<result property="userId" column="user_id"/>
<result property="userName" column="user_name"/>
<result property="deliveryAddressId" column="delivery_address_id"/>
<result property="deliveryAddress" column="delivery_address"/>
<result property="deliveryName" column="delivery_name"/>
<result property="deliveryPhone" column="delivery_phone"/>
<result property="itemsPrice" column="items_price"/>
<result property="totalPrice" column="total_price"/>
<result property="realityPay" column="reality_pay"/>
<result property="deliveryFlag" column="delivery_flag"/>
<result property="deliveryTime" column="delivery_time"/>
<result property="expressCost" column="express_cost"/>
<result property="couponId" column="coupon_id"/>
<result property="couponTitle" column="coupon_title"/>
<result property="couponPrice" column="coupon_price"/>
<result property="fee" column="fee"/>
<result property="tax" column="tax"/>
<result property="payId" column="pay_id"/>
<result property="payStatus" column="pay_status"/>
<result property="enableFlag" column="enable_flag"/>
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity" id="tbCfOrderMap">
<result property="orderId" column="order_id"/>
<result property="orderNo" column="order_no"/>
<result property="orderName" column="order_name"/>
<result property="orderTime" column="order_time"/>
<result property="updateTime" column="update_time"/>
<result property="dealTime" column="deal_time"/>
<result property="closeTime" column="close_time"/>
<result property="orderStatus" column="order_status"/>
<result property="userId" column="user_id"/>
<result property="userName" column="user_name"/>
<result property="deliveryAddressId" column="delivery_address_id"/>
<result property="deliveryAddress" column="delivery_address"/>
<result property="deliveryName" column="delivery_name"/>
<result property="deliveryPhone" column="delivery_phone"/>
<result property="itemsPrice" column="items_price"/>
<result property="totalPrice" column="total_price"/>
<result property="realityPay" column="reality_pay"/>
<result property="deliveryFlag" column="delivery_flag"/>
<result property="deliveryTime" column="delivery_time"/>
<result property="expressCost" column="express_cost"/>
<result property="couponId" column="coupon_id"/>
<result property="couponTitle" column="coupon_title"/>
<result property="couponPrice" column="coupon_price"/>
<result property="fee" column="fee"/>
<result property="tax" column="tax"/>
<result property="payId" column="pay_id"/>
<result property="payStatus" column="pay_status"/>
<result property="enableFlag" column="enable_flag"/>
<result property="descripitionName" column="descripition_name"></result>
</resultMap>
</resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select
......@@ -82,34 +82,34 @@
</select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
select
`order_id`,
`order_no`,
`order_name`,
`order_time`,
`update_time`,
`deal_time`,
`close_time`,
`order_status`,
`user_id`,
`user_name`,
`delivery_address_id`,
`delivery_address`,
`delivery_name`,
`delivery_phone`,
`items_price`,
`total_price`,
`reality_pay`,
`delivery_flag`,
`delivery_time`,
`express_cost`,
`coupon_id`,
`coupon_title`,
`coupon_price`,
`fee`,
`tax`,
`pay_id`,
`pay_status`,
`enable_flag`,
`order_id`,
`order_no`,
`order_name`,
`order_time`,
`update_time`,
`deal_time`,
`close_time`,
`order_status`,
`user_id`,
`user_name`,
`delivery_address_id`,
`delivery_address`,
`delivery_name`,
`delivery_phone`,
`items_price`,
`total_price`,
`reality_pay`,
`delivery_flag`,
`delivery_time`,
`express_cost`,
`coupon_id`,
`coupon_title`,
`coupon_price`,
`fee`,
`tax`,
`pay_id`,
`pay_status`,
`enable_flag`,
`descripition_name`
from tb_cf_order
WHERE 1=1
......@@ -117,27 +117,27 @@
AND name LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by order_id desc
order by order_id desc
</otherwise>
</choose>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_order
WHERE 1=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
</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>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
......@@ -202,9 +202,9 @@
#{enableFlag},
#{descripitionName})
</insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
update tb_cf_order
update tb_cf_order
<set>
<if test="orderNo != null">`order_no` = #{orderNo}, </if>
<if test="orderName != null">`order_name` = #{orderName}, </if>
......@@ -241,25 +241,25 @@
<delete id="delete">
delete from tb_cf_order where order_id = #{value}
</delete>
<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=")">
#{orderId}
</foreach>
</delete>
<!--获取用户订单数据-->
<!--获取用户订单数据-->
<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>
order by order_time desc
</select>
<select id="getOrdersId" resultType="String">
order by order_time desc
</select>
<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>
<!--根据订单id，获取订单内商品详情-->
<select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
<!--根据订单id，获取订单内商品详情-->
<select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
SELECT
t1.*,
t5.template_title descripitionName
......@@ -279,7 +279,7 @@
t1.item_title,
t1.item_num,
t1.item_price,
t1.item_category,
t5.template_id descripitionId,
t5.template_title descripitionName
FROM
tb_cf_item_detail t1
......@@ -288,11 +288,13 @@
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
WHERE
t2.enable_flag = 1 and t2.order_item_id=#{order_id}
t2.enable_flag = 1 and t2.order_item_id=#{orderId}
</select>
<!--获取付款订单-->
<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 r.enable_flag=1
and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
</select>
......@@ -302,16 +304,18 @@
o.user_id,
r.order_item_id order_id,
p.create_time deliveryTime,
a.address_country_name countryName,
o.delivery_address,
p.p_express_number expressId,
i.item_id itemId,
e.template_title descripitionName
i.item_num,
p.descripition_id
from tb_cf_order o
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_detail i on r.item_id=i.item_id
LEFT JOIN tb_cf_express_template e on e.template_id=p.descripition_id
where o.delivery_flag=20 and o.enable_flag=1
LEFT JOIN tb_cf_address a on a.user_id=o.user_id
where r.delivery_flag=10 and r.enable_flag=1
and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
</select>
......
src/main/resources/mapper/TbCfUserInfoDao.xml
浏览文件 @ f470d559
......@@ -53,20 +53,7 @@
from tb_cf_user_info
where user_id = #{id}
</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
`user_id`,
......@@ -229,5 +216,18 @@
<update id="updatePassWord">
update tb_cf_user_info set password=#{newPassword} where user_id=#{userId}
</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>
\ No newline at end of file
src/test/java/com/diaoyun/zion/ZionApplicationTests.java
浏览文件 @ f470d559
......@@ -417,7 +417,7 @@ public class ZionApplicationTests {
@Test
public void testDate() throws ParseException {
String res = "2019-10-2 10:04:59";
String res = "2019-12-10 10:04:59";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = simpleDateFormat.parse(res);
long it = date.getTime();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论