价格设置

apps/admin/config/views.py

@@ -16,10 +16,16 @@ class ConfigViewSet(CustomModelViewSet):
     queryset = Config.objects.filter()
     serializer_class = ConfigSerializer
 
-    def filter_queryset(self, queryset):
-        queryset = queryset.filter()
-        f = ConfigFilter(self.request.GET, queryset=queryset)
-        return f.qs
+    # def filter_queryset(self, queryset):
+    #     queryset = queryset.filter()
+    #     f = ConfigFilter(self.request.GET, queryset=queryset)
+    #     return f.qs
+
+    # 不分页用list
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        serializer = self.get_serializer(queryset, many=True)
+        return response_ok(serializer.data)
 
     def create(self, request, *args, **kwargs):
         data = json.loads(request.POST.get('data'))

apps/admin/tenant/views.py

@@ -21,7 +21,7 @@ from .filters import TenantFilter
 from apps.tenant.option.models import Option
 from apps.tenant.notices.models import Notices, NoticesToUser
 from apps.WechatApplet.models import WechatApplet
-
+from apps.tenant.config.models import Config
 
 class TenantViewSet(CustomModelViewSet):
     permission_classes = [IsAdministratorUser, ]
@@ -114,6 +114,10 @@ class TenantViewSet(CustomModelViewSet):
 
                 instance.status = status
                 instance.reject_reason = reject_reason
+                if int(status) == settings.PASS:
+                    days = Config.getIntValue(Config.FREE_DAYS)
+                    instance.end_date = (datetime.datetime.now() + datetime.timedelta(days=days)).strftime('%Y-%m-%d')
+                    instance.save()
 
                 if not instance.wxapp_img:
                     applet = WechatApplet.objects.filter(authorizer_appid=settings.WEAPP['appid']).first()

apps/tenant/config/models.py

@@ -7,6 +7,23 @@ config_file = 'config/'
 class Config(models.Model):
     KEY_RENEW_YEAR_1 = 'renew_year_1'  #续费年限1
     KEY_RENEW_AMOUNT_1 = 'renew_amount_1'  #续费金额1
+    FREE_DAYS = 'free_days'  # 免费体验天数
+
+    EDITION_1_YUAN = 'edition_1_yuan' # 标准版原价
+    EDITION_1_ONE_YEAR = 'edition_1_one_year' # 标准版1年
+    EDITION_1_TWO_YEAR = 'edition_1_two_year' # 标准版2年
+    EDITION_1_THREE_YEAR = 'edition_1_three_year' # 标准版3年
+
+    EDITION_2_YUAN = 'edition_2_yuan' # 专业版原价
+    EDITION_2_ONE_YEAR = 'edition_2_one_year' # 专业版1年
+    EDITION_2_TWO_YEAR = 'edition_2_two_year' # 专业版2年
+    EDITION_2_THREE_YEAR = 'edition_2_three_year' # 专业版3年
+
+    EDITION_3_YUAN = 'edition_3_yuan' # 无限版原价
+    EDITION_3_ONE_YEAR = 'edition_3_one_year' # 无限版1年
+    EDITION_3_TWO_YEAR = 'edition_3_two_year' # 无限版2年
+    EDITION_3_THREE_YEAR = 'edition_3_three_year' # 无限版3年
+
 
     property = models.CharField(max_length=100, verbose_name=u'属性')
     value = models.TextField(verbose_name=u'值')
@@ -18,3 +35,11 @@ class Config(models.Model):
             'property',
         )
         default_permissions = ()
+
+    @staticmethod
+    def getIntValue(key):
+        config = Config.objects.filter(property=key).first()
+        if config:
+            return config.value
+        else:
+            return 0

apps/tenant/models.py

@@ -89,7 +89,7 @@ class Pay(models.Model):
     WAIT = 0
     PAY = 1
     CONFIRM = 2
-    UNDO = 4
+    UNDO = 3
     STATUS_CHOICES = (
         (WAIT, u'待付款'),
         (PAY, u'已付款'),
@@ -253,4 +253,4 @@ class Invoice(models.Model):
         db_table = 'invoice'
         ordering = ['-id']
         verbose_name = '申请发票'
-        default_permissions = ()
+        default_permissions = ()

apps/wxapp/tenant/serializers.py

@@ -20,7 +20,7 @@ class TenantSerializer(serializers.ModelSerializer):
         validated_data['user'] = self.context['request'].user
         instance = super(TenantSerializer, self).create(validated_data)
         instance.company_no = instance.get_no()
-        instance.end_date = (datetime.datetime.now() + datetime.timedelta(days=30)).strftime('%Y-%m-%d')
+        # instance.end_date = (datetime.datetime.now() + datetime.timedelta(days=30)).strftime('%Y-%m-%d')
         instance.save()
         Upload.objects._addnew(instance, user, Upload.COMPANY_IMAGE, image)
         return instance

uis/zzlyadmin/config/index.html

@@ -39,6 +39,115 @@
                         </div>
                         <div class="layui-form-mid ">元</div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">免费体验天数：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="free_days" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">天</div>
+                    </div>
+                    <br>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">标准版原价：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_1_yuan" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">标准版1年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_1_one_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">标准版2年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_1_two_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">标准版3年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_1_three_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+
+                    <br>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">专业版原价：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_2_yuan" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">专业版1年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_2_one_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">专业版2年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_2_two_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">专业版3年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_2_three_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+
+                    <br>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">无限版原价：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_3_yuan" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">无限版1年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_3_one_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">无限版2年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_3_two_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">无限版3年费用：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="edition_3_three_year" lay-verify="required" class="layui-input"
+                                   placeholder="整数"/>
+                        </div>
+                        <div class="layui-form-mid ">元</div>
+                    </div>
 
                     <div class="layui-input-block">
                         <button class="layui-btn" lay-submit lay-filter="component-form-element">保存
@@ -77,20 +186,11 @@
             }
         });
 
-        var form_data = [];
         form.on('submit(component-form-element)', function (data) {
             var save_data = [];
-            if (data.field['renew_amount_1']) {
-                save_data.push({key: 'renew_amount_1', value: data.field['renew_amount_1']})
-            } else {
-                save_data.push({key: 'renew_amount_1', value: '0'})
+            for (var key in data.field) {
+                save_data.push({key: key, value: data.field[key]})
             }
-            if (data.field['renew_year_1']) {
-                save_data.push({key: 'renew_year_1', value: data.field['renew_year_1']})
-            } else {
-                save_data.push({key: 'renew_year_1', value: '0'})
-            }
-
             admin.req({
                 url: '/admin/config/'
                 , data: {data: JSON.stringify(save_data)}