xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 18:26:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!157 2022-2-11 Carl

Browse Source 
Merge pull request !157 from Admin/sit-Carl
This commit is contained in:
Admin 2022-02-11 03:08:26 +00:00 committed by Gitee
commit 4cc84d3f49
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/OrdersDao.java
View File

@ -24,4 +24,8 @@ public interface OrdersDao extends BaseMapper<OrderEntity> {
int updateByOrderNumber (@Param("orderNumber")String orderNumber);
int updateOrderStatusByOrderNumber (@Param("orderNumber")String orderNumber,@Param("orderStatus")String orderStatus);
int updateOrderPayAmountByOrderNumber (@Param("orderNumber")String orderNumber,@Param("orderPayAmount")String orderPayAmount);
}

11
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -249,6 +249,17 @@ public class OrderService {
//新增支付方式paytype
jsonObjectResult.put("paytype",orderEntity.getPayType());
jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
//同步订单状态
if(!jsonObjectResult.getString("status").equals(orderEntity.getOrderStatus())){
ordersDao.updateOrderStatusByOrderNumber(jsonObjectResult.getString("orderNumber"),jsonObjectResult.getString("status"));
}
//同步订单金额
if(jsonObjectResult.getString("paymentAmount") != null){
if(!jsonObjectResult.getString("paymentAmount").equals(orderEntity.getPayAmount())){
ordersDao.updateOrderPayAmountByOrderNumber(jsonObjectResult.getString("orderNumber"),jsonObjectResult.getString("paymentAmount"));
}
}
}
}

12
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
View File

@ -28,6 +28,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.util.*;
@ -96,7 +97,7 @@ public class WxpayService {
// 更新订单状态
if ("SUCCESS".equals(sortedMap.get("result_code"))) {
String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
String totalFee = sortedMap.get("total_fee"); // 交易金额
String totalFee = changeY2F(Integer.parseInt(sortedMap.get("total_fee"))); // 交易金额
OrderEntity orderEntity = orderService.findByOrderId(outTradeNo);
String [] products = orderEntity.getProductCode().split(",");
ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
@ -143,6 +144,7 @@ public class WxpayService {
addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName"));
addOrSaveEntity.setPaymentAmount(totalFee);
addOrSaveEntity.setPaymentToken(sortedMap.get("transaction_id"));
addOrSaveEntity.setPaymentResult("SUCCESS");
if (orderEntity.getCouponCode() != "" && null != orderEntity.getCouponCode()) {
//coupon json化
OrderCouponEntity orderCouponEntity = new OrderCouponEntity();
@ -190,6 +192,14 @@ public class WxpayService {
}
/**
* 分转换成元
* @param price
* @return
*/
public static String changeY2F(int price) {
return BigDecimal.valueOf(Long.valueOf(price)).divide(new BigDecimal(100)).toString();
}

12
smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml
View File

@ -28,4 +28,16 @@
where order_no = #{orderNumber}
</update>
<update id="updateOrderStatusByOrderNumber" >
update t_good_orders
set pay_type = #{orderStatus}
where order_no = #{orderNumber}
</update>
<update id="updateOrderPayAmountByOrderNumber" >
update t_good_orders
set pay_amount = #{orderPayAmount}
where order_no = #{orderNumber}
</update>
</mapper>