Commit b5fa3cf6 by jinxin

返回当前时间

parent d01122a2
...@@ -83,6 +83,7 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -83,6 +83,7 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
logger.info("企业微信查询返回实体:{}", JSON.toJSONString(wxEnterpriseDTO)); logger.info("企业微信查询返回实体:{}", JSON.toJSONString(wxEnterpriseDTO));
licenceOrderDTO.setWxEnterpriseName(wxEnterpriseDTO.getCorpName()); licenceOrderDTO.setWxEnterpriseName(wxEnterpriseDTO.getCorpName());
} }
licenceOrderDTO.setNowTime(new Date());
return ServiceResponse.success(licenceOrderDTO); return ServiceResponse.success(licenceOrderDTO);
} }
return ServiceResponse.success(); return ServiceResponse.success();
...@@ -220,7 +221,6 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -220,7 +221,6 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
String orderId = object.getString("orderId"); String orderId = object.getString("orderId");
String timeStamp = object.getString("timeStamp"); String timeStamp = object.getString("timeStamp");
Integer orderStatus = object.getInteger("orderStatus"); Integer orderStatus = object.getInteger("orderStatus");
String buyerUserId = object.getString("buyerUserId");
TabHaobanLicenceOrder order = licenceOrderService.selectByQywxOrderId(orderId, openCorpId); TabHaobanLicenceOrder order = licenceOrderService.selectByQywxOrderId(orderId, openCorpId);
if ("license_pay_success".equals(infoType)){ if ("license_pay_success".equals(infoType)){
//支付回调 //支付回调
...@@ -228,8 +228,14 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -228,8 +228,14 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 1,order.getEnterpriseId(),order.getWxEnterpriseId(),"系统",0); licenceOrderService.updateLicenceOrderType(order.getOrderId(), 1,order.getEnterpriseId(),order.getWxEnterpriseId(),"系统",0);
} }
if ("license_refund".equals(infoType)){ if ("license_refund".equals(infoType)){
//退款回调 todo 根据退款状态判断 //退款回调 订单状态,1:退款成功,2:退款被拒绝。
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 6,order.getEnterpriseId(),order.getWxEnterpriseId(),"系统",0); if (orderStatus == 1){
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 6,order.getEnterpriseId(),order.getWxEnterpriseId(),"系统",0);
//微信退款
}else if (orderStatus == 2){
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 5,order.getEnterpriseId(),order.getWxEnterpriseId(),"系统",0);
}
} }
return ServiceResponse.success(true); return ServiceResponse.success(true);
} }
......
...@@ -207,7 +207,8 @@ ...@@ -207,7 +207,8 @@
</select> </select>
<select id="getLicenceOrderPage" resultMap="BaseResultMap"> <select id="getLicenceOrderPage" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/> SELECT
<include refid="Base_Column_List"/>
FROM tab_haoban_licence_order FROM tab_haoban_licence_order
WHERE delete_flag = 0 WHERE delete_flag = 0
<if test="transactionId != null"> <if test="transactionId != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment