设定不退款，设定国内、外用户

app-api/src/main/java/com/hboxs/control/api/order/OrderController.java

@@ -928,6 +928,11 @@ public class OrderController extends BaseController {
             return JsonMessage.error("订单非支付状态");
         }
 
+        Admin admin = adminService.find(equipment.getAdminId());
+        if(admin.getIsRefund()!=null&&admin.getIsRefund().equals("0")){
+            return JsonMessage.error("机器设定不退款");
+        }
+
         String notifyUrl = JoinpayConstant.Notify_Refund_Url;
 
         JSONArray altInfoArray = JSONArray.parseArray(order.getAltInfo());

app-backend-web/src/main/java/com/hboxs/control/admin/AdminAgencyController.java

@@ -148,6 +148,7 @@ public class AdminAgencyController extends BaseController {
         admin.setAreaId(areaId);
         admin.setParentId(adminService.getCurrent().getId());
         admin.setIsAdmined(false);
+        admin.setIsRefund("0");
         adminService.save(admin);
 
         admin.setAgencyId(admin.getId());
@@ -273,7 +274,7 @@ public class AdminAgencyController extends BaseController {
         admin.setParentId(agencyId);
 
         admin.setIsAdmined(false);
-
+        admin.setIsRefund("0");
         admin.setAgencyId(agencyId);
         adminService.save(admin);
 

app-backend-web/src/main/java/com/hboxs/control/admin/AdminMerchantController.java

@@ -302,6 +302,7 @@ public class AdminMerchantController extends BaseController {
         admin.setIsAdmined(false);
         admin.setAgencyId(adminService.find(merchantId).getAgencyId());
         admin.setMerchantId(merchantId);
+        admin.setIsRefund("0");
         adminService.save(admin);
 
         admin.setPersonageId(admin.getId());

app-backend-web/src/main/java/com/hboxs/control/admin/OrderController.java

@@ -168,9 +168,8 @@ public class OrderController extends BaseController {
      * 删除
      */
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public
     @ResponseBody
-    Message delete(Long[] ids) {
+    public  Message delete(Long[] ids) {
         orderService.delete(ids);
         return SUCCESS_MESSAGE;
     }

app-backend-web/src/main/java/com/hboxs/control/admin/PromoCodeController.java

@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
@@ -81,7 +82,7 @@ public class PromoCodeController extends BaseController {
      * 列表
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public String agencyList(Long code,String isUse,Pageable pageable, ModelMap model) {
+    public ModelAndView agencyList(Long code,String isUse,Pageable pageable, ModelMap model) {
 
         if (code != null) {
             pageable.getFilters().add(Filter.eq("code", code));
@@ -103,7 +104,7 @@ public class PromoCodeController extends BaseController {
         model.addAttribute("code", code);
         model.addAttribute("page", promoCodeService.findPage(pageable));
         model.addAttribute("currentAdmin", adminService.getCurrent());
-        return "/admin/promoCode/list";
+        return new ModelAndView("/admin/promoCode/list");
     }
 
     /**

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminAgency/add.ftl

@@ -48,9 +48,12 @@ $().ready(function() {
             email: {
                 email: true
             },
-            areaId:{
-                required: true
+			ifForeign:{
+				required: true
 			}
+            // areaId:{
+            //     required: true
+			// }
 		},
 		messages: {
 			username: {
@@ -74,7 +77,7 @@ $().ready(function() {
 		<table class="input tabContent">
             <tr>
                 <th>
-                    <span class="requiredField">*</span>地区:
+                    <span class=""></span>地区:
                 </th>
                 <td>
                     <input type="hidden" id="areaId" name="areaId" />
@@ -114,6 +117,15 @@ $().ready(function() {
             </tr>
 			<tr>
 				<th>
+					<span class="requiredField">*</span>是否国内:
+				</th>
+				<td>
+					<label><input name="ifForeign" type="radio" value="0" />是 </label>
+					<label><input name="ifForeign" type="radio" value="1" />否 </label>
+				</td>
+			</tr>
+			<tr>
+				<th>
 					邮箱:
 				</th>
 				<td>

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminAgency/addMerchant.ftl

@@ -49,9 +49,12 @@
                     email: {
                         email: true
                     },
-                    areaId: {
+                    ifForeign:{
                         required: true
-                    }
+                    },
+                    // areaId: {
+                    //     required: true
+                    // }
                 },
                 messages: {
                     username: {
@@ -76,7 +79,7 @@
         <input type="hidden" name="agencyId" value="${agencyId}">
         <tr>
             <th>
-                <span class="requiredField">*</span>地区:
+                <span class=""></span>地区:
             </th>
             <td>
                 <input type="hidden" id="areaId" name="areaId"/>
@@ -116,6 +119,15 @@
         </tr>
         <tr>
             <th>
+                <span class="requiredField">*</span>是否国内:
+            </th>
+            <td>
+                <label><input name="ifForeign" type="radio" value="0" />是 </label>
+                <label><input name="ifForeign" type="radio" value="1" />否 </label>
+            </td>
+        </tr>
+        <tr>
+            <th>
                 邮箱:
             </th>
             <td>

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminAgency/edit.ftl

@@ -243,6 +243,28 @@ $().ready(function() {
                     ${mch.approve_note}
                 </td>
             </tr>
+            [#if currentAdmin.type=="admin"]
+                <tr>
+                    <th>
+                        <span class="requiredField">*</span>是否退款:
+                    </th>
+                    <td>
+                        [#if admin.isRefund=='1']
+                            <label><input name="isRefund" type="radio" value="1" checked/>是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                        [#if admin.isRefund=='0']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" checked/>否 </label>
+                        [/#if]
+                        [#if admin.isRefund!='0'&&admin.isRefund!='1']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                    </td>
+                </tr>
+            [/#if]
+
             <tr>
                 <th>
                     <span class="requiredField">*</span>联系人名称:

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminMerchant/addPersonage.ftl

@@ -49,9 +49,12 @@
                     email: {
                         email: true
                     },
-                    areaId: {
+                    ifForeign:{
                         required: true
-                    }
+                    },
+                    // areaId: {
+                    //     required: true
+                    // }
                 },
                 messages: {
                     username: {
@@ -116,6 +119,15 @@
         </tr>
         <tr>
             <th>
+                <span class="requiredField">*</span>是否国内:
+            </th>
+            <td>
+                <label><input name="ifForeign" type="radio" value="0" />是 </label>
+                <label><input name="ifForeign" type="radio" value="1" />否 </label>
+            </td>
+        </tr>
+        <tr>
+            <th>
                 邮箱:
             </th>
             <td>

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminMerchant/edit.ftl

@@ -237,6 +237,28 @@ $().ready(function() {
                     ${mch.approve_note}
                 </td>
             </tr>
+            [#if currentAdmin.type=="admin"]
+                <tr>
+                    <th>
+                        <span class="requiredField">*</span>是否退款:
+                    </th>
+                    <td>
+                        [#if admin.isRefund=='1']
+                            <label><input name="isRefund" type="radio" value="1" checked/>是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                        [#if admin.isRefund=='0']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" checked/>否 </label>
+                        [/#if]
+                        [#if admin.isRefund!='0'&&admin.isRefund!='1']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                    </td>
+                </tr>
+            [/#if]
+
             <tr>
                 <th>
                     <span class="requiredField">*</span>联系人名称:

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminPersonage/edit.ftl

@@ -234,6 +234,28 @@ $().ready(function() {
                     ${mch.approve_note}
                 </td>
             </tr>
+
+            [#if currentAdmin.type=="admin"]
+                <tr>
+                    <th>
+                        <span class="requiredField">*</span>是否退款:
+                    </th>
+                    <td>
+                        [#if admin.isRefund=='1']
+                            <label><input name="isRefund" type="radio" value="1" checked/>是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                        [#if admin.isRefund=='0']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" checked/>否 </label>
+                        [/#if]
+                        [#if admin.isRefund!='0'&&admin.isRefund!='1']
+                            <label><input name="isRefund" type="radio" value="1" />是 </label>
+                            <label><input name="isRefund" type="radio" value="0" />否 </label>
+                        [/#if]
+                    </td>
+                </tr>
+            [/#if]
             <tr>
                 <th>
                     <span class="requiredField">*</span>联系人名称:

app-entity/src/main/java/com/hboxs/entity/Admin.java

@@ -88,6 +88,16 @@ public class Admin extends BaseEntity {
     private String loginIp;
 
     /**
+     * 是否退款
+     */
+    private String isRefund;
+
+    /**
+     * 是否国内
+     */
+    private String ifForeign;
+
+    /**
      * 上级
      */
     private Long parentId;
@@ -416,6 +426,19 @@ public class Admin extends BaseEntity {
     }
 
     /**
+     * 是否退款
+     *
+     * @param
+     */
+    public String getIsRefund() {
+        return isRefund;
+    }
+
+    public void setIsRefund(String isRefund) {
+        this.isRefund = isRefund;
+    }
+
+    /**
      * 获取角色
      *
      * @return 角色
@@ -484,6 +507,14 @@ public class Admin extends BaseEntity {
         this.personageId = personageId;
     }
 
+    public String getIfForeign() {
+        return ifForeign;
+    }
+
+    public void setIfForeign(String ifForeign) {
+        this.ifForeign = ifForeign;
+    }
+
     /**
      * 后台id加密后uid 例如：366 -> u25963
      */