ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit 15e76a72b54227bb5bef6f2ec67f1de88a43ae9d 2 parents 58d3d800 a333704c

Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order

Inline Side-by-side
Showing 27 changed files with 1302 additions and 52 deletions
package com.yohoufo.dal.order;
import com.yohoufo.dal.order.model.EntrySellerRechargeOrder;
public interface EntrySellerRechargeOrderMapper {
int deleteByPrimaryKey(Integer id);
int insert(EntrySellerRechargeOrder record);
int insertSelective(EntrySellerRechargeOrder record);
EntrySellerRechargeOrder selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(EntrySellerRechargeOrder record);
int updateByPrimaryKey(EntrySellerRechargeOrder record);
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order;
import com.yohoufo.dal.order.model.MachineIdGenerate;
import java.util.List;
public interface MachineIdGenerateMapper {
int deleteByPrimaryKey(Integer id);
int insert(MachineIdGenerate record);
int insertSelective(MachineIdGenerate record);
MachineIdGenerate selectByPrimaryKey(Integer id);
MachineIdGenerate selectByIp(String ip);
List<MachineIdGenerate> selectByAll();
int updateByPrimaryKeySelective(MachineIdGenerate record);
int updateByPrimaryKey(MachineIdGenerate record);
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order;
import com.yohoufo.dal.order.model.SellerWalletDetail;
public interface SellerWalletDetailMapper {
int deleteByPrimaryKey(Integer id);
int insert(SellerWalletDetail record);
int insertSelective(SellerWalletDetail record);
SellerWalletDetail selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(SellerWalletDetail record);
int updateByPrimaryKey(SellerWalletDetail record);
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order;
import com.yohoufo.dal.order.model.SellerWallet;
public interface SellerWalletMapper {
int deleteByPrimaryKey(Integer id);
int insert(SellerWallet record);
int insertSelective(SellerWallet record);
SellerWallet selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(SellerWallet record);
int updateByPrimaryKey(SellerWallet record);
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order.model;
import java.math.BigDecimal;
public class EntrySellerRechargeOrder {
private Integer id;
private Integer uid;
private Long orderCode;
private Integer payment;
private Integer status;
private BigDecimal amount;
private Integer type;
private Integer createTime;
private Integer updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getUid() {
return uid;
}
public void setUid(Integer uid) {
this.uid = uid;
}
public Long getOrderCode() {
return orderCode;
}
public void setOrderCode(Long orderCode) {
this.orderCode = orderCode;
}
public Integer getPayment() {
return payment;
}
public void setPayment(Integer payment) {
this.payment = payment;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getCreateTime() {
return createTime;
}
public void setCreateTime(Integer createTime) {
this.createTime = createTime;
}
public Integer getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Integer updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order.model;
public class MachineIdGenerate {
private Integer id;
private String ip;
private Integer machineId;
private Integer createTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip == null ? null : ip.trim();
}
public Integer getMachineId() {
return machineId;
}
public void setMachineId(Integer machineId) {
this.machineId = machineId;
}
public Integer getCreateTime() {
return createTime;
}
public void setCreateTime(Integer createTime) {
this.createTime = createTime;
}
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order.model;
import java.math.BigDecimal;
public class SellerWallet {
private Integer id;
private Integer uid;
private BigDecimal amount;
private Byte status;
private Byte type;
private Integer createTime;
private Integer updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getUid() {
return uid;
}
public void setUid(Integer uid) {
this.uid = uid;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public Byte getType() {
return type;
}
public void setType(Byte type) {
this.type = type;
}
public Integer getCreateTime() {
return createTime;
}
public void setCreateTime(Integer createTime) {
this.createTime = createTime;
}
public Integer getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Integer updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
... ...
package com.yohoufo.dal.order.model;
import java.math.BigDecimal;
public class SellerWalletDetail {
private Integer id;
private Integer walletId;
private Integer uid;
private Long orderCode;
private BigDecimal amount;
private Byte type;
private Integer createTime;
private Integer updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getWalletId() {
return walletId;
}
public void setWalletId(Integer walletId) {
this.walletId = walletId;
}
public Integer getUid() {
return uid;
}
public void setUid(Integer uid) {
this.uid = uid;
}
public Long getOrderCode() {
return orderCode;
}
public void setOrderCode(Long orderCode) {
this.orderCode = orderCode;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public Byte getType() {
return type;
}
public void setType(Byte type) {
this.type = type;
}
public Integer getCreateTime() {
return createTime;
}
public void setCreateTime(Integer createTime) {
this.createTime = createTime;
}
public Integer getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Integer updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yohoufo.dal.order.EntrySellerRechargeOrderMapper" >
<resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.EntrySellerRechargeOrder" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="uid" property="uid" jdbcType="INTEGER" />
<result column="order_code" property="orderCode" jdbcType="BIGINT" />
<result column="payment" property="payment" jdbcType="TINYINT" />
<result column="status" property="status" jdbcType="TINYINT" />
<result column="amount" property="amount" jdbcType="DECIMAL" />
<result column="type" property="type" jdbcType="TINYINT" />
<result column="create_time" property="createTime" jdbcType="INTEGER" />
<result column="update_time" property="updateTime" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, uid, order_code, payment, status, amount, type, create_time, update_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
<include refid="Base_Column_List" />
from entry_seller_recharge_order
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
delete from entry_seller_recharge_order
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.yohoufo.dal.order.model.EntrySellerRechargeOrder" >
insert into entry_seller_recharge_order (id, uid, order_code,
payment, status, amount,
type, create_time, update_time
)
values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=INTEGER}, #{orderCode,jdbcType=BIGINT},
#{payment,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{amount,jdbcType=DECIMAL},
#{type,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.yohoufo.dal.order.model.EntrySellerRechargeOrder" >
insert into entry_seller_recharge_order
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="uid != null" >
uid,
</if>
<if test="orderCode != null" >
order_code,
</if>
<if test="payment != null" >
payment,
</if>
<if test="status != null" >
status,
</if>
<if test="amount != null" >
amount,
</if>
<if test="type != null" >
type,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="updateTime != null" >
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="uid != null" >
#{uid,jdbcType=INTEGER},
</if>
<if test="orderCode != null" >
#{orderCode,jdbcType=BIGINT},
</if>
<if test="payment != null" >
#{payment,jdbcType=TINYINT},
</if>
<if test="status != null" >
#{status,jdbcType=TINYINT},
</if>
<if test="amount != null" >
#{amount,jdbcType=DECIMAL},
</if>
<if test="type != null" >
#{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
#{updateTime,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.EntrySellerRechargeOrder" >
update entry_seller_recharge_order
<set >
<if test="uid != null" >
uid = #{uid,jdbcType=INTEGER},
</if>
<if test="orderCode != null" >
order_code = #{orderCode,jdbcType=BIGINT},
</if>
<if test="payment != null" >
payment = #{payment,jdbcType=TINYINT},
</if>
<if test="status != null" >
status = #{status,jdbcType=TINYINT},
</if>
<if test="amount != null" >
amount = #{amount,jdbcType=DECIMAL},
</if>
<if test="type != null" >
type = #{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
update_time = #{updateTime,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.EntrySellerRechargeOrder" >
update entry_seller_recharge_order
set uid = #{uid,jdbcType=INTEGER},
order_code = #{orderCode,jdbcType=BIGINT},
payment = #{payment,jdbcType=TINYINT},
status = #{status,jdbcType=TINYINT},
amount = #{amount,jdbcType=DECIMAL},
type = #{type,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yohoufo.dal.order.MachineIdGenerateMapper" >
<resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.MachineIdGenerate" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="ip" property="ip" jdbcType="VARCHAR" />
<result column="machine_id" property="machineId" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, ip, machine_id, create_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
<include refid="Base_Column_List" />
from machine_id_generate
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByIp" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from machine_id_generate
where ip = #{ip,jdbcType=VARCHAR}
</select>
<select id="selectByAll" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List" />
from machine_id_generate
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
delete from machine_id_generate
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.yohoufo.dal.order.model.MachineIdGenerate" >
insert into machine_id_generate (id, ip, machine_id,
create_time)
values (#{id,jdbcType=INTEGER}, #{ip,jdbcType=VARCHAR}, #{machineId,jdbcType=INTEGER},
#{createTime,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.yohoufo.dal.order.model.MachineIdGenerate" >
insert into machine_id_generate
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="ip != null" >
ip,
</if>
<if test="machineId != null" >
machine_id,
</if>
<if test="createTime != null" >
create_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="ip != null" >
#{ip,jdbcType=VARCHAR},
</if>
<if test="machineId != null" >
#{machineId,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.MachineIdGenerate" >
update machine_id_generate
<set >
<if test="ip != null" >
ip = #{ip,jdbcType=VARCHAR},
</if>
<if test="machineId != null" >
machine_id = #{machineId,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.MachineIdGenerate" >
update machine_id_generate
set ip = #{ip,jdbcType=VARCHAR},
machine_id = #{machineId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yohoufo.dal.order.SellerWalletDetailMapper" >
<resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.SellerWalletDetail" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="wallet_id" property="walletId" jdbcType="INTEGER" />
<result column="uid" property="uid" jdbcType="INTEGER" />
<result column="order_code" property="orderCode" jdbcType="BIGINT" />
<result column="amount" property="amount" jdbcType="DECIMAL" />
<result column="type" property="type" jdbcType="TINYINT" />
<result column="create_time" property="createTime" jdbcType="INTEGER" />
<result column="update_time" property="updateTime" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, wallet_id, uid, order_code, amount, type, create_time, update_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
<include refid="Base_Column_List" />
from seller_wallet_detail
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
delete from seller_wallet_detail
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.yohoufo.dal.order.model.SellerWalletDetail" >
insert into seller_wallet_detail (id, wallet_id, uid,
order_code, amount, type,
create_time, update_time)
values (#{id,jdbcType=INTEGER}, #{walletId,jdbcType=INTEGER}, #{uid,jdbcType=INTEGER},
#{orderCode,jdbcType=BIGINT}, #{amount,jdbcType=DECIMAL}, #{type,jdbcType=TINYINT},
#{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.yohoufo.dal.order.model.SellerWalletDetail" >
insert into seller_wallet_detail
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="walletId != null" >
wallet_id,
</if>
<if test="uid != null" >
uid,
</if>
<if test="orderCode != null" >
order_code,
</if>
<if test="amount != null" >
amount,
</if>
<if test="type != null" >
type,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="updateTime != null" >
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="walletId != null" >
#{walletId,jdbcType=INTEGER},
</if>
<if test="uid != null" >
#{uid,jdbcType=INTEGER},
</if>
<if test="orderCode != null" >
#{orderCode,jdbcType=BIGINT},
</if>
<if test="amount != null" >
#{amount,jdbcType=DECIMAL},
</if>
<if test="type != null" >
#{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
#{updateTime,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.SellerWalletDetail" >
update seller_wallet_detail
<set >
<if test="walletId != null" >
wallet_id = #{walletId,jdbcType=INTEGER},
</if>
<if test="uid != null" >
uid = #{uid,jdbcType=INTEGER},
</if>
<if test="orderCode != null" >
order_code = #{orderCode,jdbcType=BIGINT},
</if>
<if test="amount != null" >
amount = #{amount,jdbcType=DECIMAL},
</if>
<if test="type != null" >
type = #{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
update_time = #{updateTime,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.SellerWalletDetail" >
update seller_wallet_detail
set wallet_id = #{walletId,jdbcType=INTEGER},
uid = #{uid,jdbcType=INTEGER},
order_code = #{orderCode,jdbcType=BIGINT},
amount = #{amount,jdbcType=DECIMAL},
type = #{type,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yohoufo.dal.order.SellerWalletMapper" >
<resultMap id="BaseResultMap" type="com.yohoufo.dal.order.model.SellerWallet" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="uid" property="uid" jdbcType="INTEGER" />
<result column="amount" property="amount" jdbcType="DECIMAL" />
<result column="status" property="status" jdbcType="TINYINT" />
<result column="type" property="type" jdbcType="TINYINT" />
<result column="create_time" property="createTime" jdbcType="INTEGER" />
<result column="update_time" property="updateTime" jdbcType="INTEGER" />
</resultMap>
<sql id="Base_Column_List" >
id, uid, amount, status, type, create_time, update_time
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
<include refid="Base_Column_List" />
from seller_wallet
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
delete from seller_wallet
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.yohoufo.dal.order.model.SellerWallet" >
insert into seller_wallet (id, uid, amount,
status, type, create_time,
update_time)
values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=INTEGER}, #{amount,jdbcType=DECIMAL},
#{status,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, #{createTime,jdbcType=INTEGER},
#{updateTime,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.yohoufo.dal.order.model.SellerWallet" >
insert into seller_wallet
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="uid != null" >
uid,
</if>
<if test="amount != null" >
amount,
</if>
<if test="status != null" >
status,
</if>
<if test="type != null" >
type,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="updateTime != null" >
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="uid != null" >
#{uid,jdbcType=INTEGER},
</if>
<if test="amount != null" >
#{amount,jdbcType=DECIMAL},
</if>
<if test="status != null" >
#{status,jdbcType=TINYINT},
</if>
<if test="type != null" >
#{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
#{updateTime,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.yohoufo.dal.order.model.SellerWallet" >
update seller_wallet
<set >
<if test="uid != null" >
uid = #{uid,jdbcType=INTEGER},
</if>
<if test="amount != null" >
amount = #{amount,jdbcType=DECIMAL},
</if>
<if test="status != null" >
status = #{status,jdbcType=TINYINT},
</if>
<if test="type != null" >
type = #{type,jdbcType=TINYINT},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=INTEGER},
</if>
<if test="updateTime != null" >
update_time = #{updateTime,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.yohoufo.dal.order.model.SellerWallet" >
update seller_wallet
set uid = #{uid,jdbcType=INTEGER},
amount = #{amount,jdbcType=DECIMAL},
status = #{status,jdbcType=TINYINT},
type = #{type,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
... ...
package com.yohoufo.order.controller;
import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
import com.yohobuy.ufo.model.order.req.SellerOrderCancelReq;
import com.yohobuy.ufo.model.order.req.SellerOrderComputeReq;
import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
import com.yohobuy.ufo.model.order.req.*;
import com.yohobuy.ufo.model.order.resp.BatchChangePriceResp;
import com.yohoufo.common.ApiResponse;
import com.yohoufo.common.annotation.IgnoreSession;
import com.yohoufo.common.annotation.IgnoreSignature;
... ... @@ -11,7 +10,6 @@ import com.yohoufo.common.exception.GatewayException;
import com.yohoufo.dal.order.model.SellerOrder;
import com.yohoufo.order.model.response.OrderSubmitResp;
import com.yohoufo.order.service.handler.SellerOrderComputeHandler;
import com.yohoufo.order.service.impl.SellerOrderCancelService;
import com.yohoufo.order.service.impl.SellerOrderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
... ... @@ -34,6 +32,9 @@ public class SellerOrderController {
@Autowired
private SellerOrderService sellerOrderService;
@Autowired
private SellerOrderComputeHandler sellerOrderComputeHandler;
/**
* 根据卖家提交价格来计算各项费用
* @param uid
... ... @@ -46,8 +47,10 @@ public class SellerOrderController {
@ResponseBody
public ApiResponse computePublishPrd(@RequestParam(name = "uid", required = true)int uid,
@RequestParam(name = "storage_id", required = true)int storage_id,
@RequestParam(name="price", required = true)String price) throws GatewayException {
SellerOrderComputeReq req = SellerOrderComputeReq.builder().uid(uid).storageId(storage_id).price(price).build();
@RequestParam(name="price", required = true)String price,
@RequestParam(name="num", defaultValue = "1", required = false)int num) throws GatewayException {
SellerOrderComputeReq req = SellerOrderComputeReq.builder().uid(uid).storageId(storage_id).price(price)
.num(num).build();
logger.info("in ufo.sellerOrder.computePublishPrd, req {}", req);
SoldPrdComputeBo computeBo = sellerOrderService.computePublishPrd(req);
return new ApiResponse.ApiResponseBuilder().code(200).data(computeBo).message("算费成功").build();
... ... @@ -68,7 +71,8 @@ public class SellerOrderController {
public ApiResponse publishPrd(@RequestParam(name = "uid", required = true)int uid,
@RequestParam(name = "storage_id", required = true)int storage_id,
@RequestParam(name="price", required = true)String price,
@RequestParam(name="address_id")String address_id) throws GatewayException {
@RequestParam(name="address_id")String address_id,
@RequestParam(name="num", defaultValue = "1", required = false)int num) throws GatewayException {
SellerOrderSubmitReq req = SellerOrderSubmitReq.builder()
.uid(uid)
.storageId(storage_id)
... ... @@ -80,7 +84,33 @@ public class SellerOrderController {
return new ApiResponse.ApiResponseBuilder().data(resp).code(200).message("发布成功").build();
}
/**
* 入驻商家的批量下架
* @param uid
* @param batchNo
* @param num
* @return
* @throws GatewayException
*/
@RequestMapping(params = "method=ufo.sellerOrder.batchCancel")
@ResponseBody
public ApiResponse batchCancel(@RequestParam(name = "uid", required = true)int uid,
@RequestParam(name = "batchNo", required = true)String batchNo,
@RequestParam(name="num", defaultValue = "1", required = false)int num,
@RequestParam(name = "skupList", required = true)String skupList
) throws GatewayException {
SellerOrderBatchCancelReq req = SellerOrderBatchCancelReq.builder()
.uid(uid).batchNo(batchNo).storageNum(num).skupList(skupList)
.build();
logger.info("in ufo.sellerOrder.batchCancel, req {}", req);
boolean result = sellerOrderService.batchCancel(req);
String msg = "批量取消成功";
if(!result){
msg = "批量取消失败";
}
return new ApiResponse.ApiResponseBuilder().data(result).code(200).message(msg).build();
}
... ... @@ -144,8 +174,7 @@ public class SellerOrderController {
return new ApiResponse.ApiResponseBuilder().data(result).code(200).message(msg).build();
}
@Autowired
private SellerOrderComputeHandler sellerOrderComputeHandler;
@RequestMapping(params = "method=ufo.skup.earnestMoneyRange")
@ResponseBody
... ... @@ -154,4 +183,31 @@ public class SellerOrderController {
.data(sellerOrderComputeHandler.getEarnestMoneyrange())
.message("get EarnestMoneyrange success").build();
}
/**
* 批量调价
* @param uid
* @param batchNo
* @param price
* @return
* @throws GatewayException
*/
@RequestMapping(params = "method=ufo.sellerOrder.batchChangePrice")
@ResponseBody
public ApiResponse batchChangePrice(@RequestParam(name = "uid", required = true)int uid,
@RequestParam(name = "price", required = true)String price,
@RequestParam(name = "batchNo", required = true)String batchNo,
@RequestParam(name = "skupList", required = true)String skupList
) throws GatewayException {
BatchChangePriceReq req = BatchChangePriceReq.builder()
.uid(uid).price(price)
.batchNo(batchNo).skupList(skupList)
.build();
logger.info("in ufo.sellerOrder.batchChangePrice, req {}", req);
BatchChangePriceResp result = sellerOrderService.batchChangePrice(req);
return new ApiResponse.ApiResponseBuilder().data(result).code(200).message(result.getTips()).build();
}
}
... ...
... ... @@ -24,6 +24,8 @@ public class PaymentRequest {
* 退款金额
*/
private double refundAmount;
private String amount;
private String openid;
... ...
... ... @@ -30,6 +30,6 @@ public class ShoppingRequest {
*/
private String channelNo;
private String amount;
}
... ...
... ... @@ -143,6 +143,9 @@ public class PaymentServiceImpl implements IPaymentService {
}else if(codeMeta.getType() == OrderCodeType.SELLER_TYPE.getType()){
paymentService = this.sellerOrderPaymentService;
}else if(codeMeta.getType() == OrderCodeType.SELLER_RECHARGE_EARNEST_TYPE.getType()){
// TODO
paymentService = this.sellerOrderPaymentService;
}
return paymentService;
... ...
... ... @@ -4,15 +4,15 @@ import com.yoho.error.ServiceError;
import com.yoho.error.exception.ServiceException;
import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
import com.yohobuy.ufo.model.order.common.*;
import com.yohobuy.ufo.model.order.req.SellerOrderCancelReq;
import com.yohobuy.ufo.model.order.req.SellerOrderComputeReq;
import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
import com.yohobuy.ufo.model.order.req.*;
import com.yohobuy.ufo.model.order.resp.BatchChangePriceResp;
import com.yohobuy.ufo.model.order.resp.OrderCntResp;
import com.yohobuy.ufo.model.order.resp.PageResp;
import com.yohoufo.common.alarm.EventBusPublisher;
import com.yohoufo.common.alarm.SmsAlarmEvent;
import com.yohoufo.common.exception.GatewayException;
import com.yohoufo.common.utils.AddressUtil;
import com.yohoufo.common.utils.BigDecimalHelper;
import com.yohoufo.common.utils.DateUtil;
import com.yohoufo.dal.order.*;
import com.yohoufo.dal.order.model.*;
... ... @@ -24,6 +24,8 @@ import com.yohoufo.order.event.OrderCancelEvent;
import com.yohoufo.order.model.AddressInfo;
import com.yohobuy.ufo.model.order.bo.GoodsInfo;
import com.yohoufo.order.model.SellerOrderContext;
import com.yohoufo.order.model.dto.EarnestMoney;
import com.yohoufo.order.model.dto.PlatformFeeDto;
import com.yohoufo.order.model.dto.SellerOrderComputeResult;
import com.yohoufo.order.model.request.OrderListRequest;
import com.yohoufo.order.model.request.OrderRequest;
... ... @@ -111,13 +113,22 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
public SoldPrdComputeBo computePublishPrd(SellerOrderComputeReq req) throws GatewayException {
log.info("in computePublishPrd, req {}", req);
int uid = req.getUid();
if(uid <= 0){
log.warn("in computePublishPrd uid illegal , req {}", req);
throw new GatewayException(400, "用户ID错误");
}
//
Integer storageId = req.getStorageId();
if (storageId <=0 ){
log.warn("in computePublishPrd storageId illegal , req {}", req);
throw new GatewayException(400, "storageId 错误");
}
int num;
if ((num = req.getNum())<=0){
log.warn("in computePublishPrd num illegal , req {}", req);
throw new GatewayException(400, "非法数量值");
}
/*商品鉴定费 ￥10.00
商品包装费 ￥10.00
... ... @@ -134,19 +145,15 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
throw new GatewayException(400, "价格须为以9结尾的正整数");
}
BigDecimal prdPrice = null;
try{
prdPrice = new BigDecimal(price);
}catch (Exception e){
log.warn("in computePublishPrd price convert BigDecimal fail, {}", req);
return null;
throw new GatewayException(400, "非法数字");
}
checkPrice(storageId, prdPrice, false);
return buildSoldPrdComputeBo(prdPrice);
return buildSoldPrdComputeBo(uid, num, prdPrice);
}
... ... @@ -366,6 +373,11 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
return true;
}
public boolean batchCancel(SellerOrderBatchCancelReq req){
return true;
}
public boolean cancel(SellerOrderCancelReq req){
log.info("seller self cancel order,req {}", req);
... ... @@ -477,9 +489,28 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
private boolean isEnough(int uid, BigDecimal mEarestMoney){
//todo 取出入驻商家的钱包余额，判断保证金总额是否足够扣减
return false;
}
public SoldPrdComputeBo buildSoldPrdComputeBo(BigDecimal prdPrice){
private SoldPrdComputeBo buildSoldPrdComputeBo(int uid, int num, BigDecimal prdPrice){
SellerOrderComputeResult computeResult = computeHandler.compute(prdPrice);
/**
* 验证是否是入驻商家
*/
boolean isEntryShop = userProxyService.isEntryShop(uid);
if(isEntryShop){
BigDecimal singleEarestMoney = computeResult.getEarnestMoney().getEarnestMoney();
BigDecimal mEarestMoney = BigDecimalHelper.halfUp(new BigDecimal(num).multiply(singleEarestMoney));
boolean isEnough = isEnough(uid, mEarestMoney);
if (!isEnough){
throw new ServiceException(ServiceError.WALLET_EARNESTMONEY_IS_NOT_ENOUGH);
}
}
SoldPrdComputeBo computeBo = SellerOrderConvertor.computeResult2SoldPrdComputeBo(computeResult);
return computeBo;
}
... ... @@ -547,4 +578,12 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
.actor(orderRequest.getTabType()).build();
}
public BatchChangePriceResp batchChangePrice(BatchChangePriceReq req){
BatchChangePriceResp resp = BatchChangePriceResp.builder().successCnt(1).failCnt(1)
.tips("变价成功1个,失败1个").build();
return resp;
}
}
... ...
... ... @@ -8,6 +8,7 @@ import com.yoho.error.ServiceError;
import com.yoho.error.exception.ServiceException;
import com.yoho.service.model.request.UserAddressReqBO;
import com.yohoufo.common.ApiResponse;
import com.yohoufo.common.caller.UfoServiceCaller;
import com.yohoufo.order.convert.AddressInfoConvertor;
import com.yohoufo.order.model.AddressInfo;
import org.apache.commons.lang3.StringUtils;
... ... @@ -38,6 +39,9 @@ public class UserProxyService {
@Value("${uic.url:http://uic.yohoops.org/uic}")
private String uicUrl;
@Autowired
private UfoServiceCaller ufoServiceCaller;
/**
* 获取用户信息
* @param uid
... ... @@ -133,4 +137,20 @@ public class UserProxyService {
}
return mobile;
}
public boolean isEntryShop(int uid){
//入驻商户 method=ufo.user.isStoredSeller ,入参 uid
ApiResponse userInfo ;
try {
userInfo = ufoServiceCaller.call("ufo.user.isStoredSeller", uid);
}catch (Exception ex){
logger.warn("in getMobile fail, uid {}", uid, ex);
throw new ServiceException(ServiceError.USER_IS_NOT_EXIST);
}
logger.info("judge user is entry shop, uid {} resp {}", uid, userInfo);
return (userInfo == null || userInfo.getData() == null) ? false : (boolean) userInfo.getData();
}
}
... ...
... ... @@ -4,12 +4,14 @@ package com.yohoufo.order.service.support.codegenerator.bean;
import lombok.Data;
/**
* <pre>
* 生成订单号bit元数据
* 订单号:
* 1位: 类型(标识是卖家订单号or买家订单号)
* 2位: 类型(标识是卖家订单号or买家订单号)
* 30位: 时间戳(秒级时间) 2的30次方/60/6024/365=34,也就是说可以用30年
* 10位: 序列号, 也就是说 每秒支持1K多的id
* 3位: 服务节点，支持8个服务节点
* </pre>
*/
@Data
public class CodeBitMeta {
... ... @@ -17,7 +19,7 @@ public class CodeBitMeta {
/**
* 类型
*/
private byte typeBits = 1;
private byte typeBits = 2;
/**
... ... @@ -35,7 +37,7 @@ public class CodeBitMeta {
*/
private byte machineBits = 3;
// 最右边长度为machineBits位为1，其他为0
public long getMachineBitsMask() {
return -1L ^ -1L << machineBits;
}
... ...
package com.yohoufo.order.service.support.codegenerator.populater;
import com.yohoufo.common.utils.DateUtil;
import com.yohoufo.common.utils.IpUtils;
import org.apache.commons.lang3.StringUtils;
import com.yohoufo.dal.order.MachineIdGenerateMapper;
import com.yohoufo.dal.order.model.MachineIdGenerate;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import java.util.stream.Collectors;
@Component
public class PropMachineIdProvider implements MachineIdProvider {
protected final Logger log = LoggerFactory.getLogger(this.getClass());
private Map<String, Long> ipsMap = new HashMap<String, Long>();
@Autowired
MachineIdGenerateMapper machineIdGenerateMapper;
@Value("${ips.machine}")
private String machineIps;
/**
* 默认的机器Id
* @return
*/
private long machineId = 0l;
@Override
public long getMachineId() {
return machineId;
}
@PostConstruct
public void init(){
String ip = IpUtils.getHostIp();
MachineIdGenerate machineIdGenerate = machineIdGenerateMapper.selectByIp(IpUtils.getHostIp());
if (machineIdGenerate != null){
machineId = machineIdGenerate.getMachineId();
log.info("machineId is {}", machineId);
return;
}
log.info("ip：{}, machineIps is {}",ip, machineIps);
Long machineId = ipsMap.get(ip);
// 初次启动，插入该ip的一条记录
Integer usableMachineId = getUsableMachineId();
int row = insertMachineId(usableMachineId, ip);
if (machineId == null){
return 0l;
if (row > 0){
machineId = usableMachineId.intValue();
log.info("machineId is {}", machineId);
return;
}
return machineId.longValue();
// 插入失败，重复的machineId, ==> 重试一次
usableMachineId = getUsableMachineId();
row = insertMachineId(usableMachineId, ip);
if (row > 0){
machineId = usableMachineId.intValue();
log.info("machineId is {}", machineId);
return;
}
throw new IllegalStateException("insert into ufo_order.machine_id_generate fail");
}
private int insertMachineId(Integer usableMachineId, String ip) {
@PostConstruct
public void init(){
if (StringUtils.isEmpty(machineIps)) {
return;
MachineIdGenerate db = new MachineIdGenerate();
db.setIp(ip);
db.setMachineId(usableMachineId.intValue());
db.setCreateTime(DateUtil.getCurrentTimeSecond());
return machineIdGenerateMapper.insert(db);
}
private Integer getUsableMachineId() {
List<MachineIdGenerate> machines = machineIdGenerateMapper.selectByAll();
if (CollectionUtils.isEmpty(machines)){
return 0;
}
String[] ips = machineIps.split(",");
List<Integer> machineIds = machines.stream().map(MachineIdGenerate::getMachineId).collect(Collectors.toList());
Integer usableMachineId = null;
for (int i=0; i<7; i++){
if (!machineIds.contains(Integer.valueOf(i))){
usableMachineId = Integer.valueOf(i);
break;
}
}
for (int i=0; i < ips.length; i++){
ipsMap.put(ips[i], (long)i);
// 无可用的machineid，联系管理员删除db数据
if (usableMachineId == null){
throw new IllegalStateException("check ufo_order.machine_id_generate machine 0-7 full.");
}
return usableMachineId;
}
}
... ...
package com.yohoufo.order.service;
import com.yohoufo.common.utils.IpUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.recipes.locks.InterProcessMultiLock;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.zookeeper.CreateMode;
import sun.net.util.IPAddressUtil;
import java.util.Arrays;
import java.util.List;
public class TestZKLock {
public static void main(String[] args) throws Exception{
String connectionStr = "192.168.102.45";
String lock_path = "/ufo/code_lock";
String path = "/ufo/machine/id";
CuratorFramework client = CuratorFrameworkFactory.builder()
.connectString(connectionStr)
.retryPolicy(new ExponentialBackoffRetry(1000, 3))
.sessionTimeoutMs(5000)
.connectionTimeoutMs(1000).build();
client.start();
InterProcessMultiLock lock = new InterProcessMultiLock(client, Arrays.asList(lock_path));
for (int i =0 ;i < 30; i++){
new Thread(new Runnable() {
@Override
public void run() {
try{
lock.acquire();
// 指定节点下面的 子节点
List<String> ids = client.getChildren().forPath(path);
if (CollectionUtils.isEmpty(ids)){
// 生成第一个节点
client.create().withMode(CreateMode.EPHEMERAL).forPath(path +"/0");
}else{
// 方案①
// 看看临时节点中哪个有空缺，则采用，
// 就会出现新的问题，zk上临时节点是空缺的，但是服务采用了那个空缺的id，所以必须监听重连
// 重连的时候，必须重新创建节点，更新服务使用的id
// 只需要 监听该节点被删除的时候，需要重新创建新的临时节点，更新machineId
// 一遍在获取，一遍在更新临时节点，非原子性，如果获取到的是旧的值，则有可能导致code重复
// 初始化的时候，给自己的ip 建立一个节点 自增，持久
// 方案②
// 直接采用ip==>数字
// 临时节点的话，没有必要记录ip，反正重发就已经删除了，也不会有根据ip获取id的情况
// 持久节点的话，要考虑什么事情清理
client.create().withMode(CreateMode.EPHEMERAL).forPath(path + "/" + IpUtils.getHostIp());
}
}catch (Exception e){
}finally {
try{
lock.release();
}catch (Exception e){
}
}
}
}).start();
}
Thread.sleep(Integer.MAX_VALUE);
}
}
... ...
package com.yohoufo.order.service;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.curator.framework.api.CuratorEvent;
import org.apache.curator.framework.recipes.cache.*;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.zookeeper.CreateMode;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
public class ZkTest {
public static void main(String[] args) throws Exception{
String rootPath = "/ufo/machine";
String path = rootPath + "/id";
String zookeeperConnectionString = "192.168.102.45";
RetryPolicy retryPolicy = new ExponentialBackoffRetry(1000, 3);
CuratorFramework client = CuratorFrameworkFactory.builder()
.connectString(zookeeperConnectionString)
.sessionTimeoutMs(500)
.connectionTimeoutMs(5000)
.retryPolicy(retryPolicy)
.build();
client.start();
// 失败重连 监听
client.getConnectionStateListenable().addListener(new ConnectionStateListener() {
@Override
public void stateChanged(CuratorFramework client, ConnectionState newState) {
System.out.println("当前客户端的连接状态： " +newState);
}
});
// 子节点监听
// PathChildrenCache cache = new PathChildrenCache(client, rootPath, true);
// cache.start();
// cache.getListenable().addListener(new PathChildrenCacheListener() {
// @Override
// public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception {
// System.out.println("事情类型" + event.getType());
// if (event.getData() != null){
// System.out.println("节点数据"+ event.getData().getPath() + " = " + new String(event.getData().getData()));
// }
// }
// });
String str = client.create().creatingParentsIfNeeded().withMode(CreateMode.EPHEMERAL_SEQUENTIAL).forPath(path);
System.out.println(str);
// 异步回调事件
String str2 = client.create().creatingParentsIfNeeded().withMode(CreateMode.EPHEMERAL_SEQUENTIAL).inBackground(new BackgroundCallback() {
@Override
public void processResult(CuratorFramework curatorFramework, CuratorEvent curatorEvent) throws Exception {
System.out.println(curatorEvent.getResultCode() + "; " + curatorEvent.getType());
}
}).forPath(path);
System.out.println(str2);
// 现在的sessionId 0x1650ce0cd5a2482
// str.replace(path, "").replaceFirst("^0*","")
// 临时顺序节点，取模，一直自增，❌必然会出现 某几台机器的ip的顺序节点对8取模，结果是一样的，那么订单就有问题。
// or 把本机ip/序号 持久节点 固定ip获取到的机器保持一样的
// ①
// session超时，重连的时候，临时节点会重新创建吗
// curator不需要像clientZK一样，监听器，连接成功后，才往下处理 ❓❓❓
// 回答: 断开网络，通过链接的监听器，发现确实会自动重连，重连后能接受到子节点删除的事件，但是临时节点不会自动重新创建
// ②
// 当网络闪断重连的时候，sessionid发生改变，也就是说之前的session被清理了，临时节点也被清理了，问，临时节点上的watcher会不会被清理，客户端还能收到通知结果吗
// 实验证明不会 0x1650ce0cd5a24aa
// ③
// 如何模拟 SESSION_EXPIRE 的状态
//
List<String> ids = client.getChildren().forPath(rootPath);
for (String id : ids){
System.out.println("子节点路径=" + id + "; 子节点的数据=" + new String(client.getData().forPath(rootPath + "/" + id)));
NodeCache cache2 = new NodeCache(client, rootPath + "/" + id);
cache2.getListenable().addListener(new NodeCacheListener() {
@Override
public void nodeChanged() throws Exception {
ChildData data = cache2.getCurrentData();
if (null != data) {
System.out.println("节点数据：" + new String(cache2.getCurrentData().getData()));
} else {
System.out.println( "节点被删除!");
}
}
});
cache2.start();
}
// 当前的 sessionid 0x1650ce0cd5a2494
Thread.sleep(Integer.MAX_VALUE);
}
}
... ...
... ... @@ -6,7 +6,7 @@
<parent>
<groupId>com.yoho</groupId>
<artifactId>parent</artifactId>
<version>1.4.7-SNAPSHOT</version>
<version>1.4.8-SNAPSHOT</version>
</parent>
<groupId>com.yohoufo.fore</groupId>
... ... @@ -18,7 +18,7 @@
<properties>
<qiniu.version>7.0.5</qiniu.version>
<project-name>yohoufo-fore</project-name>
<model.version>test-1.0-SNAPSHOT</model.version>
<model.version>2.0-SNAPSHOT</model.version>
</properties>
<dependencyManagement>
... ...
... ... @@ -66,9 +66,6 @@ sdk.instanceName=yohopic
yoho.recovery.zkPath=/yh/config/recovery
env.machineId=0
ips.machine=127.0.0.1
wechat.app.partnerid=1218934901
wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
... ...
... ... @@ -49,6 +49,7 @@ datasources:
- com.yohoufo.dal.order.TradeBillsMapper
- com.yohoufo.dal.order.OrdersPayTransferMapper
- com.yohoufo.dal.order.ManualTransferMapper
- com.yohoufo.dal.order.MachineIdGenerateMapper
ufo_resource:
servers:
... ...
... ... @@ -76,6 +76,3 @@ order.buyer.cancelWhenSellerUnDelivery.sellerGetMoneyRate=${order.buyer.cancelWh
erp-gateway.url=${erp-gateway.url}
uic.url=${uic.url}
yoho.message.controller.url=${yoho.message.controller.url}
ips.machine=${ips.machine}
\ No newline at end of file
... ...
... ... @@ -49,6 +49,7 @@ datasources:
- com.yohoufo.dal.order.TradeBillsMapper
- com.yohoufo.dal.order.OrdersPayTransferMapper
- com.yohoufo.dal.order.ManualTransferMapper
- com.yohoufo.dal.order.MachineIdGenerateMapper
ufo_resource:
servers:
... ...