Merge pull request #2 from linlinjava/master

update

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/DbJob.java

@@ -38,7 +38,7 @@ public class DbJob {
         String db = url.substring(index1+5, index2);
 
         LocalDate localDate = LocalDate.now();
-        String fileName = localDate.toString();
+        String fileName = localDate.toString() + ".sql";
         File file = new File("backup", fileName);
         file.getParentFile().mkdirs();
         file.createNewFile();
@@ -47,8 +47,11 @@ public class DbJob {
         DbUtil.backup(file, user, password, db);
         // 删除七天前数据库备份文件
         LocalDate before = localDate.minusDays(7);
-        File fileBefore = new File("backup", fileName);
-        fileBefore.deleteOnExit();
+        String fileBeforeName = before.toString()+".sql";
+        File fileBefore = new File("backup", fileBeforeName);
+        if (fileBefore.exists()) {
+            fileBefore.delete();
+        }
 
         logger.info("系统结束定时任务数据库备份");
     }

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAftersaleController.java

@@ -183,7 +183,7 @@ public class AdminAftersaleController {
         wxPayRefundRequest.setOutRefundNo("refund_" + order.getOrderSn());
         // 元转成分
         Integer totalFee = aftersaleOne.getAmount().multiply(new BigDecimal(100)).intValue();
-        wxPayRefundRequest.setTotalFee(totalFee);
+        wxPayRefundRequest.setTotalFee(order.getActualPrice().multiply(new BigDecimal(100)).intValue());
         wxPayRefundRequest.setRefundFee(totalFee);
 
         WxPayRefundResult wxPayRefundResult;

litemall-core/src/main/java/org/linlinjava/litemall/core/notify/AliyunSmsSender.java

@@ -8,6 +8,7 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
+import com.qcloud.cos.utils.Jackson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.linlinjava.litemall.core.util.JacksonUtil;
@@ -26,6 +27,8 @@ public class AliyunSmsSender implements SmsSender {
     private String accessKeySecret;
     private String sign;
 
+    private final String okCode = "OK";
+
     public String getRegionId() {
         return regionId;
     }
@@ -106,8 +109,15 @@ public class AliyunSmsSender implements SmsSender {
         try {
             CommonResponse response = client.getCommonResponse(request);
             SmsResult smsResult = new SmsResult();
-            smsResult.setSuccessful(true);
             smsResult.setResult(response);
+            String code =  Jackson.jsonNodeOf(response.getData()).get("Code").asText();
+            if (response.getHttpResponse().isSuccess() && okCode.equals(code) ){
+                smsResult.setSuccessful(true);
+            }else {
+                smsResult.setSuccessful(false);
+                logger.error("短信发送失败："+response.getData());
+            }
+
             return smsResult;
         } catch (ServerException e) {
             e.printStackTrace();