Просмотр исходного кода

[POS][修改]:couponOrder新加核销类型字段

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
f55c7f0ca3
6 измененных файлов: 55 добавлений и 7 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201908161540__POS_CHANGED.sql
  2. +30
    -0
      mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
  3. +6
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  5. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +13
    -7
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201908161540__POS_CHANGED.sql Просмотреть файл

@@ -0,0 +1,2 @@
alter table wx_coupon_order
add `verify_type` tinyint(6) NULL COMMENT '核销类型(0:B端核销, 1:POS独立核销 2:POS交易核销)';

+ 30
- 0
mallinkPosApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -611,6 +611,36 @@ public class PosController extends BaseController {
} }
} }


@ApiOperation(value = "POS订单同步", notes = "支付成功/支付取消后订单同步")
@PostMapping("/posOrderSync")
@SystemControllerLog(description = "POS订单同步")
public Map<String, String> posOrderSync(@RequestBody Map<String, String> params) {
logger.info(params.toString());
JSONObject payContent = new JSONObject();

// 1. check sign
Map<String, String> retMap = checkSign(params, payContent);
if (retMap != null) {
// 签名相关异常返回
return retMap;
}
String resKey = payContent.getString("resKey");
logger.info("resKey: " + resKey);

try {

} catch (MallinkException e) {
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "",
WxPayConstant.RET_FAIL,
e.getErrorCode(), e.getMessage());
} catch (Exception e) {
return buildReturnMap(retMap, resKey, WxPayConstant.RET_SUCCESS, "",
WxPayConstant.RET_FAIL,
500, e.getMessage());
}
return null;
}



/** /**
* 构造返回map,无签名, 有错误 * 构造返回map,无签名, 有错误


+ 6
- 0
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -915,6 +915,7 @@ public class PosServiceImpl implements PosService {
couponOrder.setTenantId(couponOrderCVo.getTenantId()); couponOrder.setTenantId(couponOrderCVo.getTenantId());
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()); couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode());
couponOrder.setBUserId(buUserId); couponOrder.setBUserId(buUserId);
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_POS_PAY.getCode());
couponOrder.setUpdateDate(new Date()); couponOrder.setUpdateDate(new Date());
num = couponOrderMapper.updateVerifyCouponOrder(couponOrder); num = couponOrderMapper.updateVerifyCouponOrder(couponOrder);
} catch (Exception e) { } catch (Exception e) {
@@ -1016,6 +1017,11 @@ public class PosServiceImpl implements PosService {
couponOrder.setId(couponOrderCVo.getId()); couponOrder.setId(couponOrderCVo.getId());
couponOrder.setTenantId(couponOrderCVo.getTenantId()); couponOrder.setTenantId(couponOrderCVo.getTenantId());
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销
if (actionType.equals(EnumVerifyActionType.VERIFY_INDEPENT)) {
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_POS_INDEPENDENT.getCode());
} else {
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_POS_PAY.getCode());
}
if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) && if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) &&
actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { actionType.equals(EnumVerifyActionType.VERIFY_PAY)) {
couponOrder.setBUserId(buUserId); couponOrder.setBUserId(buUserId);


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java Просмотреть файл

@@ -51,6 +51,9 @@ public class WxCouponOrder extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund")
private Integer autoRefund; private Integer autoRefund;


@io.swagger.annotations.ApiModelProperty(value="核销类型(0:B端核销, 1:POS独立核销 2:POS交易核销)",name="verifyType")
private Integer verifyType;

@Transient @Transient
private String couponName; private String couponName;
@Transient @Transient


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -344,6 +344,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
try { try {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销
couponOrder.setBUserId(bUser.getId()); couponOrder.setBUserId(bUser.getId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
couponOrder.setUpdateDate(new Date()); couponOrder.setUpdateDate(new Date());
num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder);
} catch (Exception e) { } catch (Exception e) {


+ 13
- 7
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -16,10 +16,11 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" /> <result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund" /> <result column="auto_refund" jdbcType="INTEGER" property="autoRefund" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`
`id`,`tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, `verify_type`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -99,7 +100,8 @@
update wx_coupon_order update wx_coupon_order
set `coupon_order_status` = #{couponOrderStatus}, set `coupon_order_status` = #{couponOrderStatus},
`b_user_id` = #{bUserId}, `b_user_id` = #{bUserId},
`update_date` = #{updateDate}
`update_date` = #{updateDate},
`verify_type` = #{verifyType}
where `tenant_id`=#{tenantId} and id=#{id} and `b_user_id` is null where `tenant_id`=#{tenantId} and id=#{id} and `b_user_id` is null
</update> </update>


@@ -107,7 +109,8 @@
update wx_coupon_order update wx_coupon_order
set `coupon_order_status` = #{couponOrderStatus}, set `coupon_order_status` = #{couponOrderStatus},
`b_user_id` = #{bUserId}, `b_user_id` = #{bUserId},
`update_date` = #{updateDate}
`update_date` = #{updateDate},
`verify_type` = #{verifyType}
where 1=1 where 1=1
and `tenant_id`=#{tenantId} and `tenant_id`=#{tenantId}
and id=#{id} and id=#{id}
@@ -124,7 +127,8 @@
update wx_coupon_order update wx_coupon_order
set `coupon_order_status` = #{couponOrderStatus}, set `coupon_order_status` = #{couponOrderStatus},
`b_user_id` = null, `b_user_id` = null,
`update_date` = #{updateDate}
`update_date` = #{updateDate},
`verify_type` = null
where `tenant_id`=#{tenantId} and id=#{id} where `tenant_id`=#{tenantId} and id=#{id}
</update> </update>


@@ -788,13 +792,13 @@




<sql id="allCUserCouponOrderListColumns"> <sql id="allCUserCouponOrderListColumns">
co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date,c.auto_refund, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date,c.auto_refund,
cal.channel_type as send_channel_type cal.channel_type as send_channel_type
</sql> </sql>


<sql id="allCUserCouponOrderDetailColumns"> <sql id="allCUserCouponOrderDetailColumns">
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.auto_refund c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.auto_refund
</sql> </sql>


@@ -812,6 +816,7 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" /> <result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />


<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> <result column="cover_img" jdbcType="VARCHAR" property="coverImg" />
@@ -872,7 +877,7 @@
</select> </select>


<sql id="allCUserCouponOrderCarListColumns"> <sql id="allCUserCouponOrderCarListColumns">
co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,
json_extract(car.vendor_params,'$.id') as coupon_free_id json_extract(car.vendor_params,'$.id') as coupon_free_id
</sql> </sql>
@@ -892,6 +897,7 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" /> <result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />
<result column="verify_type" jdbcType="INTEGER" property="verifyType" />


<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> <result column="cover_img" jdbcType="VARCHAR" property="coverImg" />


Загрузка…
Отмена
Сохранить